Update dependencies to match versions in Debian trixie (#46)

pronovic · Jan 8, 2025 · 5027b34 · 5027b34
1 parent 8424369
commit 5027b34
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 216 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -39,7 +39,7 @@ load-plugins=
 #enable-msg=
 
 # Disable the message(s) with the given id(s).
-disable=I0011,W0702,W0703,C0302,C0321,R0902,R0911,R0912,R0913,R0914,R0915,R0801,R0101,R0102,R0916,C0113,C0305,R1705,C1801,R1720,W0107,R1717,R1711,R1714,R0205,W0707,R1725,R1732,R1731,C0206,R1731,C0209,C0201,E0601,W0719
+disable=I0011,W0702,W0703,C0302,C0321,R0902,R0911,R0912,R0913,R0914,R0915,R0801,R0101,R0102,R0916,C0113,C0305,R1705,C1801,R1720,W0107,R1717,R1711,R1714,R0205,W0707,R1725,R1732,R1731,C0206,R1731,C0209,C0201,E0601,W0719,R0917
 
 
 [REPORTS]

diff --git a/Changelog b/Changelog
@@ -1,3 +1,7 @@
+Version 3.8.4     unreleased
+
+	* Update dependencies to match versions in Debian trixie.
+
 Version 3.8.3     02 Jan 2025
 
 	* Add GitHub security policy in SECURITY.md.

diff --git a/README.md b/README.md
@@ -64,6 +64,9 @@ stable Debian release.  This means that I'm often several major versions behind
 what is available from PyPI.  If I targeted the latest PyPI version instead,
 then the Debian package for Cedar Backup would really only be usable on
 bleeding-edge Linux systems, which is probably not where most usage is found.
+As the next Debian stable release gets closer, I will sometimes migrate to
+newer versions in preparation for that release, especially if there have been
+no major functional changes in Cedar Backup recently.
 
 ## Developer Documentation
 
@@ -104,7 +107,7 @@ $ pip install cedar-backup3
 In addition to the Python package, Cedar Backup requires a variety of external 
 system dependencies.  For more information, see 
 the [Cedar Backup v3 Software Manual](https://cedar-backup3.readthedocs.io/en/stable/manual/install.html#installing-the-python-package).
-    
+
 Debian packages for Cedar Backup v3, called `cedar-backup3` and
 `cedar-backup3-doc`, were first available starting with the Debian 'stretch'
 release.  Debian derivatives (such as Ubuntu) should also contain the packages.

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -47,18 +47,17 @@ cback3-span = 'CedarBackup3.scripts:span'
 
 [tool.poetry.dependencies]
 python = ">=3.10,<4"
-chardet = "~5"                                           # Debian bookworm only has 5.1.0
-importlib-metadata = "~4"                                # Debian bookworm only has 4.12.0
-sphinx = { version="~5", optional=true }                 # Debian bookworm only has 5.3.0
-sphinx-autoapi = { version="~2", optional=true }         # Debian bookworm only has 2.0.0
-astroid = "~2"                                           # Newer versions conflict with older Sphinx
+chardet = "~=5.2.0"                                       # Debian trixie has 5.2.0
+importlib-metadata = "~=8.5.0"                            # Debian trixie has 8.5.0
+sphinx = { version="~=8.1.3", optional=true }             # Debian trixie has 8.1.3
+sphinx-autoapi = { version="~=3.3.3", optional=true }     # Debian trixie has 3.3.3
 
 [tool.poetry.extras]
 docs = [ "sphinx", "sphinx-autoapi" ]
 
 [tool.poetry.group.dev.dependencies]
 coverage = "^7.4.4"
-pylint = "~2"  # newer versions need astroid 3
+pylint = "^3.0.1"
 pre-commit = "^4.0.1"
 black = "^24.2.0"
 isort = "^5.12.0"

diff --git a/src/CedarBackup3/actions/collect.py b/src/CedarBackup3/actions/collect.py
@@ -577,7 +577,7 @@ def _getTarfilePath(config, absolutePath, archiveMode):
     elif archiveMode == "tarbz2":
         extension = "tar.bz2"
     normalized = buildNormalizedPath(absolutePath)
-    filename = "%s.%s" % (normalized, extension)
+    filename = "%s.%s" % (normalized, extension)  # pylint: disable=possibly-used-before-assignment:
     tarfilePath = pathJoin(config.collect.targetDir, filename)
     logger.debug("Tarfile path is [%s]", tarfilePath)
     return tarfilePath

diff --git a/src/CedarBackup3/cli.py b/src/CedarBackup3/cli.py
@@ -79,7 +79,9 @@
 # Imported modules
 ########################################################################
 
-import getopt
+# Note: getopt is "soft deprecated" only and is safe to use; see: https://github.com/python/cpython/pull/105735
+
+import getopt  # pylint: disable=deprecated-module:
 import logging
 import os
 import sys

diff --git a/src/CedarBackup3/tools/amazons3.py b/src/CedarBackup3/tools/amazons3.py
@@ -50,7 +50,9 @@
 # Imported modules and constants
 ########################################################################
 
-import getopt
+# Note: getopt is "soft deprecated" only and is safe to use; see: https://github.com/python/cpython/pull/105735
+
+import getopt  # pylint: disable=deprecated-module:
 import json
 import logging
 import os