remove python 3.8 support; use pep639

zzzeek · zzzeek · commit 71a70d61bead · 2025-04-26T12:09:34.000-04:00
Support for Python 3.8 has been dropped, the minimum version is now Python
3.9, as 3.8 is EOL.   This change is necessitated by the need to require
setuptools 77.0.3 in order to satisfy :pep:`639`.

The pyproject.toml configuration has been amended to use
the updated :pep:`639` configuration for license, which eliminates
loud deprecation warnings when building the package.   Note this
necessarily bumps setuptools build requirement to 77.0.3 which
forces Python 3.8 support to be dropped.

Also bump black, flake8, see what's coming

Change-Id: I927bcf345ac5296d3dd795235a745dd68238d672
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/python/black
-    rev: 23.12.0
+    rev: 25.1.0
     hooks:
     -   id: black
 
@@ -14,7 +14,7 @@ repos:
             - --keep-unused-type-checking
 
 -   repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 7.2.0
     hooks:
     -   id: flake8
         additional_dependencies:
diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst
@@ -3,7 +3,7 @@ Changelog
 =========
 
 .. changelog::
-    :version: 1.3.5
+    :version: 1.4.0
     :include_notes_from: unreleased
 
 .. changelog::
diff --git a/docs/build/unreleased/pep639.rst b/docs/build/unreleased/pep639.rst
@@ -0,0 +1,18 @@
+.. change::
+    :tags: change, general
+
+    Support for Python 3.8 has been dropped, the minimum version is now Python
+    3.9, as 3.8 is EOL.   This change is necessitated by the need to require
+    setuptools 77.0.3 in order to satisfy :pep:`639`.
+
+
+
+.. change::
+    :tags: bug, general
+
+    The pyproject.toml configuration has been amended to use
+    the updated :pep:`639` configuration for license, which eliminates
+    loud deprecation warnings when building the package.   Note this
+    necessarily bumps setuptools build requirement to 77.0.3 which
+    forces Python 3.8 support to be dropped.
+
diff --git a/dogpile/__init__.py b/dogpile/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.3.5"
+__version__ = "1.4.0"
 
 from .lock import Lock  # noqa
 from .lock import NeedRegenerationException  # noqa
diff --git a/dogpile/cache/backends/memory.py b/dogpile/cache/backends/memory.py
@@ -10,7 +10,6 @@
 
 """
 
-
 from ..api import CacheBackend
 from ..api import DefaultSerialization
 from ..api import NO_VALUE
diff --git a/dogpile/cache/backends/redis.py b/dogpile/cache/backends/redis.py
@@ -176,9 +176,9 @@ def _create_client(self):
             if self.socket_keepalive:
                 args["socket_keepalive"] = True
                 if self.socket_keepalive_options is not None:
-                    args[
-                        "socket_keepalive_options"
-                    ] = self.socket_keepalive_options
+                    args["socket_keepalive_options"] = (
+                        self.socket_keepalive_options
+                    )
 
             if self.url is not None:
                 args.update(url=self.url)
diff --git a/dogpile/cache/backends/valkey.py b/dogpile/cache/backends/valkey.py
@@ -168,9 +168,9 @@ def _create_client(self):
             if self.socket_keepalive:
                 args["socket_keepalive"] = True
                 if self.socket_keepalive_options is not None:
-                    args[
-                        "socket_keepalive_options"
-                    ] = self.socket_keepalive_options
+                    args["socket_keepalive_options"] = (
+                        self.socket_keepalive_options
+                    )
 
             if self.url is not None:
                 args.update(url=self.url)
diff --git a/dogpile/cache/plugins/mako_cache.py b/dogpile/cache/plugins/mako_cache.py
@@ -42,6 +42,7 @@
 
 
 """
+
 from mako.cache import CacheImpl
 
 
diff --git a/dogpile/util/langhelpers.py b/dogpile/util/langhelpers.py
@@ -115,9 +115,9 @@ def factory(cls, mutex):
         # this collection holds zero or one
         # thread idents as the key; a set of
         # keynames held as the value.
-        keystore: MutableMapping[
-            int, MutableSet[str]
-        ] = collections.defaultdict(set)
+        keystore: MutableMapping[int, MutableSet[str]] = (
+            collections.defaultdict(set)
+        )
 
         def fac(key):
             return KeyReentrantMutex(key, mutex, keystore)
diff --git a/hash_port.py b/hash_port.py
@@ -18,6 +18,7 @@
 tox calls the pifpaf tool to run redis/ memcached local to that
 build and has it listen on this port.
 """
+
 import os
 import sys
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,31 +1,30 @@
 [build-system]
+requires = ["setuptools >= 77.0.3"]
 build-backend = "setuptools.build_meta"
-requires = [
-    "setuptools>=61.2",
-]
 
 [project]
 name = "dogpile.cache"
 description = "A caching front-end based on the Dogpile lock."
 readme = "README.rst"
 keywords = ["caching"]
 authors = [{name = "Mike Bayer", email = "mike_mp@zzzcomputing.com"}]
-license = {text = "MIT"}
+license = "MIT"
+license-files = ["LICENSE"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
     "decorator>=4.0.0",
     "stevedore>=3.0.0",
     "typing_extensions>=4.0.1;python_version<'3.11'",
 ]
 dynamic = ["version"]
 
+
 [project.urls]
 Homepage = "https://github.com/sqlalchemy/dogpile.cache"
 Documentation = "https://dogpilecache.sqlalchemy.org"
@@ -61,7 +60,6 @@ valkey = [
 zip-safe = false
 include-package-data = true
 package-dir = {"" = "."}
-license-files = ["LICENSE"]
 
 [tool.setuptools.packages.find]
 exclude = [
@@ -81,7 +79,7 @@ version = {attr = "dogpile.__version__"}
 
 [tool.black]
 line-length = 79
-target-version = ['py38']
+target-version = ['py39']
 
 
 [tool.pytest.ini_options]
diff --git a/tests/cache/test_memcached_backend.py b/tests/cache/test_memcached_backend.py
@@ -1,5 +1,6 @@
 import os
 import ssl
+import sys
 from threading import Thread
 import time
 from unittest import mock
@@ -50,6 +51,11 @@ def _check_backend_available(cls, backend):
 class _TestTLSMemcachedConn(object):
     @classmethod
     def _check_backend_available(cls, backend):
+        if sys.version_info.minor > 12:
+            pytest.skip(
+                "Can't get TLS memcached clients to work with "
+                "py13 or greater, skipping"
+            )
         try:
             client = backend._create_client()
             client.set("x", "y")
diff --git a/tests/cache/test_region.py b/tests/cache/test_region.py
@@ -569,7 +569,6 @@ def test_get_value_metadata_expiration_ignored(self):
 
 
 class ProxyRegionTest(RegionTest):
-
     """This is exactly the same as the region test above, but it goes through
     a dummy proxy.  The purpose of this is to make sure the tests  still run
     successfully even when there is a proxy"""
@@ -587,7 +586,6 @@ def _region(self, init_args={}, config_args={}, backend="mock"):
 
 
 class CustomInvalidationStrategyTest(RegionTest):
-
     """Try region tests with custom invalidation strategy.
 
     This is exactly the same as the region test above, but it uses custom
@@ -796,7 +794,6 @@ def set(self, key, value):
             return self.proxied.set(key, value)
 
     class UsedKeysProxy(ProxyBackend):
-
         """Keep a counter of hose often we set a particular key"""
 
         def __init__(self, *args, **kwargs):
@@ -813,7 +810,6 @@ def set(self, key, value):
             self.proxied.set(key, value)
 
     class NeverSetProxy(ProxyBackend):
-
         """A totally contrived example of a Proxy that we pass arguments to.
         Never set a key that matches never_set"""
 
@@ -960,8 +956,9 @@ def test_log_time(self):
         def mock_time():
             return times.pop(0)
 
-        with mock.patch("dogpile.cache.region.log") as mock_log, mock.patch(
-            "dogpile.cache.region.time", mock.Mock(time=mock_time)
+        with (
+            mock.patch("dogpile.cache.region.log") as mock_log,
+            mock.patch("dogpile.cache.region.time", mock.Mock(time=mock_time)),
         ):
             with reg._log_time(["foo", "bar", "bat"]):
                 pass
@@ -1005,9 +1002,10 @@ def test_log_is_cache_miss(self):
     def test_log_is_value_version_miss(self):
         reg = self._region()
         inv = mock.Mock(is_hard_invalidated=lambda val: True)
-        with mock.patch(
-            "dogpile.cache.region.log"
-        ) as mock_log, mock.patch.object(reg, "region_invalidator", inv):
+        with (
+            mock.patch("dogpile.cache.region.log") as mock_log,
+            mock.patch.object(reg, "region_invalidator", inv),
+        ):
             is_(
                 reg._is_cache_miss(
                     CachedValue(
@@ -1029,9 +1027,10 @@ def test_log_is_value_version_miss(self):
     def test_log_is_hard_invalidated(self):
         reg = self._region()
         inv = mock.Mock(is_hard_invalidated=lambda val: True)
-        with mock.patch(
-            "dogpile.cache.region.log"
-        ) as mock_log, mock.patch.object(reg, "region_invalidator", inv):
+        with (
+            mock.patch("dogpile.cache.region.log") as mock_log,
+            mock.patch.object(reg, "region_invalidator", inv),
+        ):
             is_(
                 reg._is_cache_miss(
                     CachedValue("some value", {"v": value_version, "ct": 500}),
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -3,7 +3,6 @@
 
 
 class UtilsTest:
-
     """Test the relevant utils functionality."""
 
     def test_coerce_string_conf(self):
diff --git a/tox.ini b/tox.ini
@@ -32,6 +32,7 @@ setenv=
 
     {full}: FULL=-m ''
 
+
 extras=
     {redis}: pifpaf
     {redis_sentinel}: pifpaf
@@ -49,6 +50,7 @@ deps=
     # the py3k python-memcached fails for multiple
     # delete
     {memcached}: python-memcached
+
     {memcached}: python-binary-memcached>=0.29.0
     {memcached}: pymemcache>=3.5.0
     {redis}: redis>=3.4.0
@@ -89,7 +91,7 @@ commands = mypy ./dogpile/
 [testenv:pep8]
 basepython = python3
 deps=
-      flake8==6.1.0
+      flake8==7.2.0
       flake8-import-order
       flake8-builtins
       flake8-future-annotations>=0.0.5
@@ -101,7 +103,7 @@ deps=
       # in case it requires a version pin
       pydocstyle
       pygments
-      black==23.12.0
+      black==25.1.0
       slotscheck>=0.17.0
 commands =
     flake8 ./dogpile/ ./tests/ setup.py  {posargs}

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`
`43`	`43`
`44`	`44`	`"""`
	`45`	`+`
`45`	`46`	`from mako.cache import CacheImpl`
`46`	`47`
`47`	`48`