cachetools 7.1.2__tar.gz → 7.1.4__tar.gz

{cachetools-7.1.2 → cachetools-7.1.4}/CHANGELOG.rst

@@ -1,3 +1,19 @@
+v7.1.4 (2026-05-22)
+===================
+
+- Minor unit test improvements.
+
+- Update build environment.
+
+
+v7.1.3 (2026-05-18)
+===================
+
+- Minor type stub improvements.
+
+- Update build environment.
+
+
 v7.1.2 (2026-05-16)
 ===================
 

cachetools-7.1.4/MANIFEST.in

@@ -0,0 +1,3 @@
+prune .github/
+exclude .gitignore
+exclude .readthedocs.yaml

{cachetools-7.1.2/src/cachetools.egg-info → cachetools-7.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachetools
-Version: 7.1.2
+Version: 7.1.4
 Summary: Extensible memoizing collections and decorators
 Author-email: Thomas Kemmer <tkemmer@computer.org>
 Maintainer-email: Thomas Kemmer <tkemmer@computer.org>

{cachetools-7.1.2 → cachetools-7.1.4}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 61.0.0", "wheel"]
+requires = ["setuptools >= 80", "setuptools-scm >= 8.2"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -49,6 +49,6 @@ version = {attr = "cachetools.__version__"}
 
 [tool.pyright]
 typeCheckingMode = "standard"
-reportFunctionMemberAccess = false
-reportOptionalContextManager = false
-reportOptionalMemberAccess = false
+reportFunctionMemberAccess = "information"
+reportOptionalContextManager = "warning"
+reportOptionalMemberAccess = "warning"

{cachetools-7.1.2 → cachetools-7.1.4}/src/cachetools/__init__.py

@@ -12,7 +12,7 @@ __all__ = (
     "cachedmethod",
 )
 
-__version__ = "7.1.2"
+__version__ = "7.1.4"
 
 import collections
 import collections.abc
@@ -23,9 +23,6 @@ import time
 
 from . import keys
 
-# Typing stubs for this package are provided by typeshed:
-# https://github.com/python/typeshed/tree/main/stubs/cachetools
-
 
 class _DefaultSize:
     """A minimal "fake" dict that returns a constant size 1 for any key."""

{cachetools-7.1.2 → cachetools-7.1.4}/src/cachetools/func.pyi

@@ -1,19 +1,20 @@
 from collections.abc import Callable, Sequence
-from typing import Any, Final, Generic, TypeVar, overload, type_check_only
+from typing import Any, Final, Generic, ParamSpec, TypeVar, overload, type_check_only
 
 from . import _CacheInfo
 
 __all__: Final = ("fifo_cache", "lfu_cache", "lru_cache", "rr_cache", "ttl_cache")
 
+_P = ParamSpec("_P")
 _T = TypeVar("_T")
 _R = TypeVar("_R")
 
 @type_check_only
-class _cachetools_cache_wrapper(Generic[_R]):
-    __wrapped__: Callable[..., _R]
+class _cachetools_cache_wrapper(Generic[_P, _R]):
+    __wrapped__: Callable[_P, _R]
     __name__: str
     __doc__: str | None
-    def __call__(self, /, *args: Any, **kwargs: Any) -> _R: ...
+    def __call__(self, /, *args: _P.args, **kwargs: _P.kwargs) -> _R: ...
     def cache_info(self) -> _CacheInfo: ...
     def cache_clear(self) -> None: ...
     def cache_parameters(self) -> dict[str, Any]: ...
@@ -21,50 +22,50 @@ class _cachetools_cache_wrapper(Generic[_R]):
 @overload
 def fifo_cache(
     maxsize: int | None = 128, typed: bool = False
-) -> Callable[[Callable[..., _R]], _cachetools_cache_wrapper[_R]]: ...
+) -> Callable[[Callable[_P, _R]], _cachetools_cache_wrapper[_P, _R]]: ...
 @overload
 def fifo_cache(
-    maxsize: Callable[..., _R], typed: bool = False
-) -> _cachetools_cache_wrapper[_R]: ...
+    maxsize: Callable[_P, _R], typed: bool = False
+) -> _cachetools_cache_wrapper[_P, _R]: ...
 @overload
 def lfu_cache(
     maxsize: int | None = 128, typed: bool = False
-) -> Callable[[Callable[..., _R]], _cachetools_cache_wrapper[_R]]: ...
+) -> Callable[[Callable[_P, _R]], _cachetools_cache_wrapper[_P, _R]]: ...
 @overload
 def lfu_cache(
-    maxsize: Callable[..., _R], typed: bool = False
-) -> _cachetools_cache_wrapper[_R]: ...
+    maxsize: Callable[_P, _R], typed: bool = False
+) -> _cachetools_cache_wrapper[_P, _R]: ...
 @overload
 def lru_cache(
     maxsize: int | None = 128, typed: bool = False
-) -> Callable[[Callable[..., _R]], _cachetools_cache_wrapper[_R]]: ...
+) -> Callable[[Callable[_P, _R]], _cachetools_cache_wrapper[_P, _R]]: ...
 @overload
 def lru_cache(
-    maxsize: Callable[..., _R], typed: bool = False
-) -> _cachetools_cache_wrapper[_R]: ...
+    maxsize: Callable[_P, _R], typed: bool = False
+) -> _cachetools_cache_wrapper[_P, _R]: ...
 @overload
 def rr_cache(
     maxsize: int | None = 128,
     choice: Callable[[Sequence[_T]], _T] = ...,
     typed: bool = False,
-) -> Callable[[Callable[..., _R]], _cachetools_cache_wrapper[_R]]: ...
+) -> Callable[[Callable[_P, _R]], _cachetools_cache_wrapper[_P, _R]]: ...
 @overload
 def rr_cache(
-    maxsize: Callable[..., _R],
+    maxsize: Callable[_P, _R],
     choice: Callable[[Sequence[_T]], _T] = ...,
     typed: bool = False,
-) -> _cachetools_cache_wrapper[_R]: ...
+) -> _cachetools_cache_wrapper[_P, _R]: ...
 @overload
 def ttl_cache(
     maxsize: int | None = 128,
     ttl: Any = 600,
     timer: Callable[[], _T] = ...,
     typed: bool = False,
-) -> Callable[[Callable[..., _R]], _cachetools_cache_wrapper[_R]]: ...
+) -> Callable[[Callable[_P, _R]], _cachetools_cache_wrapper[_P, _R]]: ...
 @overload
 def ttl_cache(
-    maxsize: Callable[..., _R],
+    maxsize: Callable[_P, _R],
     ttl: Any = 600,
     timer: Callable[[], _T] = ...,
     typed: bool = False,
-) -> _cachetools_cache_wrapper[_R]: ...
+) -> _cachetools_cache_wrapper[_P, _R]: ...

{cachetools-7.1.2 → cachetools-7.1.4/src/cachetools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachetools
-Version: 7.1.2
+Version: 7.1.4
 Summary: Extensible memoizing collections and decorators
 Author-email: Thomas Kemmer <tkemmer@computer.org>
 Maintainer-email: Thomas Kemmer <tkemmer@computer.org>

{cachetools-7.1.2 → cachetools-7.1.4}/src/cachetools.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 CHANGELOG.rst
 LICENSE
+MANIFEST.in
 README.rst
 pyproject.toml
 tox.ini

cachetools-7.1.4/tests/test_threading.py

@@ -0,0 +1,126 @@
+import threading
+import time
+import unittest
+from typing import Any
+
+from cachetools import LRUCache, cached, cachedmethod
+
+count = 0
+
+
+@cached(cache=LRUCache(1), condition=threading.Condition(), info=True)
+def func():
+    global count
+    time.sleep(1.0)
+    count += 1
+    return count
+
+
+@cached(cache=LRUCache(1), lock=threading.Lock(), info=True)
+def locked_func():
+    global count
+    time.sleep(1.0)
+    count += 1
+    return 42
+
+
+class ThreadingTest(unittest.TestCase):
+    NTHREADS = 10
+
+    TIMEOUT = 10
+
+    cache: LRUCache[Any, int] = LRUCache(1)
+
+    cond = threading.Condition()
+
+    lock = threading.Lock()
+
+    count = 0
+
+    @cachedmethod(
+        cache=lambda self: self.cache, condition=lambda self: self.cond, info=True
+    )
+    def method(self):
+        time.sleep(1.0)
+        self.count += 1
+        return 42
+
+    @cachedmethod(cache=lambda self: self.cache, lock=lambda self: self.lock, info=True)
+    def locked_method(self):
+        time.sleep(1.0)
+        self.count += 1
+        return 42
+
+    def test_cached_stampede(self):
+        global count
+        count = 0
+        threads = [threading.Thread(target=func) for i in range(0, self.NTHREADS)]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join(timeout=self.TIMEOUT)
+            self.assertFalse(t.is_alive())
+
+        self.assertEqual(count, 1)
+
+        info = func.cache_info()
+        self.assertEqual(info.hits, self.NTHREADS - 1)
+        self.assertEqual(info.misses, 1)
+
+    def test_cachedmethod_stampede(self):
+        self.cache = LRUCache(1)
+        self.count = 0
+        threads = [
+            threading.Thread(target=self.method) for i in range(0, self.NTHREADS)
+        ]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join(timeout=self.TIMEOUT)
+            self.assertFalse(t.is_alive())
+
+        self.assertEqual(self.count, 1)
+
+        info = self.method.cache_info()
+        self.assertEqual(info.hits, self.NTHREADS - 1)
+        self.assertEqual(info.misses, 1)
+
+    def test_cached_locked(self):
+        global count
+        count = 0
+        threads = [
+            threading.Thread(target=locked_func) for i in range(0, self.NTHREADS)
+        ]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join(timeout=self.TIMEOUT)
+            self.assertFalse(t.is_alive())
+
+        # Without condition/stampede prevention, func is called by multiple
+        # threads, but all return the same cached value (42).
+        self.assertGreaterEqual(count, 1)
+
+        info = locked_func.cache_info()
+        self.assertEqual(info.hits + info.misses, self.NTHREADS)
+        self.assertGreaterEqual(info.misses, 1)
+
+    def test_cachedmethod_locked(self):
+        self.cache = LRUCache(1)
+        self.count = 0
+        threads = [
+            threading.Thread(target=self.locked_method) for i in range(0, self.NTHREADS)
+        ]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join(timeout=self.TIMEOUT)
+            self.assertFalse(t.is_alive())
+
+        # Multiple threads may compute the value, but setdefault ensures
+        # the first cached result wins and all return 42.
+        self.assertGreaterEqual(self.count, 1)
+
+        info = self.locked_method.cache_info()
+        self.assertEqual(info.hits + info.misses, self.NTHREADS)
+        self.assertGreaterEqual(info.misses, 1)

{cachetools-7.1.2 → cachetools-7.1.4}/tox.ini

@@ -1,12 +1,10 @@
 [tox]
-envlist = docs,doctest,format,lint,py,pyright
+envlist = py,docs,doctest,ruff,ruff-format,pyright
 
 [testenv]
 deps =
     pytest
     pytest-cov
-setenv =
-    THREADING_TESTS = 1
 commands =
     py.test --basetemp={envtmpdir} --cov=cachetools --cov-report term-missing {posargs}
 
@@ -22,18 +20,18 @@ deps =
 commands =
      sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs {envtmpdir}/doctest
 
-[testenv:format]
+[testenv:ruff]
 deps =
     ruff
 commands =
-    ruff format --diff -q {posargs}
+    ruff check {posargs}
 skip_install = true
 
-[testenv:lint]
+[testenv:ruff-format]
 deps =
     ruff
 commands =
-    ruff check {posargs}
+    ruff format --diff -q {posargs}
 skip_install = true
 
 [testenv:pyright]

cachetools-7.1.2/tests/test_threading.py

@@ -1,62 +0,0 @@
-import threading
-import time
-import unittest
-from os import environ
-from typing import Any
-
-from cachetools import LRUCache, cached, cachedmethod
-
-count = 0
-
-
-@cached(cache=LRUCache(1), condition=threading.Condition(), info=True)
-def func():
-    global count
-    time.sleep(1.0)
-    count += 1
-    return count
-
-
-@unittest.skipUnless(environ.get("THREADING_TESTS", False), "THREADING_TESTS not set")
-class ThreadingTest(unittest.TestCase):
-    NTHREADS = 10
-
-    cache: LRUCache[Any, int] = LRUCache(1)
-
-    cond = threading.Condition()
-
-    count = 0
-
-    @cachedmethod(
-        cache=lambda self: self.cache, condition=lambda self: self.cond, info=True
-    )
-    def meth(self):
-        time.sleep(1.0)
-        self.count += 1
-        return 42
-
-    def test_cached_stampede(self):
-        threads = [threading.Thread(target=func) for i in range(0, self.NTHREADS)]
-        for t in threads:
-            t.start()
-        for t in threads:
-            t.join()
-
-        self.assertEqual(count, 1)
-
-        info = func.cache_info()
-        self.assertEqual(info.hits, self.NTHREADS - 1)
-        self.assertEqual(info.misses, 1)
-
-    def test_cachedmethod_stampede(self):
-        threads = [threading.Thread(target=self.meth) for i in range(0, self.NTHREADS)]
-        for t in threads:
-            t.start()
-        for t in threads:
-            t.join()
-
-        self.assertEqual(self.count, 1)
-
-        info = self.meth.cache_info()
-        self.assertEqual(info.hits, self.NTHREADS - 1)
-        self.assertEqual(info.misses, 1)