Drop support for Python 3.8. (#83)

zopefoundation · Dec 19, 2024 · 8d82ad7 · 8d82ad7
1 parent ca990b3
commit 8d82ad7
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,7 +21,6 @@ jobs:
         config:
         # [Python version, tox env]
         - ["3.11", "release-check"]
-        - ["3.8", "py38"]
         - ["3.9", "py39"]
         - ["3.10", "py310"]
         - ["3.11", "py311"]

diff --git a/.meta.toml b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "fd6b76c6"
+commit-id = "d1a00d25"
 
 [python]
 with-pypy = true

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,10 +12,10 @@ repos:
     - id: autopep8
       args: [--in-place, --aggressive, --aggressive]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.17.0
+    rev: v3.19.0
     hooks:
     - id: pyupgrade
-      args: [--py38-plus]
+      args: [--py39-plus]
   - repo: https://github.com/isidentical/teyit
     rev: 0.4.3
     hooks:

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,6 +5,8 @@
 7.2 (unreleased)
 ================
 
+- Drop support for Python 3.8.
+
 - Replace deprecated multipart argument ``memfile_limit`` with ``spool_limit``
 
 - Increase the default value of ``part_limit`` for ``multipart`` to 1024 as 128

diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 
 [build-system]
-requires = ["setuptools<74"]
+requires = ["setuptools <= 75.6.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.coverage.run]

diff --git a/setup.py b/setup.py
@@ -55,7 +55,6 @@ def read(*rnames):
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
@@ -96,5 +95,5 @@ def read(*rnames):
     entry_points=entry_points,
     include_package_data=True,
     zip_safe=False,
-    python_requires='>=3.8',
+    python_requires='>=3.9',
 )
diff --git a/src/zope/publisher/configure.txt b/src/zope/publisher/configure.txt
@@ -16,7 +16,7 @@ packages are installed because of the use of
 
   >>> try:
   ...    import zope.annotation
-  ... except ImportError:
+  ... except ModuleNotFoundError:
   ...   expected_count = 22
   ... else:
   ...   expected_count = 23

diff --git a/src/zope/publisher/ftp.py b/src/zope/publisher/ftp.py
@@ -72,5 +72,5 @@ def unauthorized(self, challenge):
 # BBB
 try:
     from zope.login.ftp import FTPAuth  # noqa: F401 import unused
-except ImportError:
+except ModuleNotFoundError:
     pass
diff --git a/src/zope/publisher/http.py b/src/zope/publisher/http.py
@@ -1096,5 +1096,5 @@ def __iter__(self):
 # BBB
 try:
     from zope.login.http import BasicAuthAdapter  # noqa: F401 import unused
-except ImportError:
+except ModuleNotFoundError:
     pass
diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,6 @@ minversion = 3.18
 envlist =
     release-check
     lint
-    py38
     py39
     py310
     py311
@@ -20,7 +19,7 @@ usedevelop = true
 package = wheel
 wheel_build_env = .pkg
 deps =
-    setuptools  <74
+    setuptools <= 75.6.0
 setenv =
     ZOPE_INTERFACE_STRICT_IRO=1
 commands =
@@ -38,7 +37,7 @@ description = ensure that the distribution is ready to release
 basepython = python3
 skip_install = true
 deps =
-    setuptools <74
+    setuptools <= 75.6.0
     twine
     build
     check-manifest