chore: deprecate python 3.9 support, it's EOL soon

Author: karlicoss

.github/workflows/main.yml

@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [ubuntu-latest, macos-latest]  # windows-latest
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
         # vvv just an example of excluding stuff from matrix
         # exclude: [{platform: macos-latest, python-version: '3.6'}]
 

README.md

@@ -125,10 +125,10 @@ Cachew gives the best of two worlds and makes it both **easy and efficient**. Th
 
 # How it works
 
-- first your objects get [converted](src/cachew/marshall/cachew.py#L31) into a simpler JSON-like representation
+- first your objects get [converted](src/cachew/marshall/cachew.py#L32) into a simpler JSON-like representation
 - after that, they are mapped into byte blobs via [`orjson`](https://github.com/ijl/orjson).
 
-When the function is called, cachew [computes the hash of your function's arguments ](src/cachew/__init__.py:#L590)
+When the function is called, cachew [computes the hash of your function's arguments ](src/cachew/__init__.py:#L575)
 and compares it against the previously stored hash value.
 
 - If they match, it would deserialize and yield whatever is stored in the cache database
@@ -140,18 +140,18 @@ and compares it against the previously stored hash value.
 
 
 
-* automatic schema inference: [1](src/cachew/tests/test_cachew.py#L386), [2](src/cachew/tests/test_cachew.py#L400)
+* automatic schema inference: [1](src/cachew/tests/test_cachew.py#L384), [2](src/cachew/tests/test_cachew.py#L398)
 * supported types:
 
     * primitive: `str`, `int`, `float`, `bool`, `datetime`, `date`, `Exception`
 
-      See [tests.test_types](src/cachew/tests/test_cachew.py#L686), [tests.test_primitive](src/cachew/tests/test_cachew.py#L724), [tests.test_dates](src/cachew/tests/test_cachew.py#L636), [tests.test_exceptions](src/cachew/tests/test_cachew.py#L1124)
-    * [@dataclass and NamedTuple](src/cachew/tests/test_cachew.py#L601)
-    * [Optional](src/cachew/tests/test_cachew.py#L530) types
-    * [Union](src/cachew/tests/test_cachew.py#L831) types
-    * [nested datatypes](src/cachew/tests/test_cachew.py#L446)
+      See [tests.test_types](src/cachew/tests/test_cachew.py#L684), [tests.test_primitive](src/cachew/tests/test_cachew.py#L722), [tests.test_dates](src/cachew/tests/test_cachew.py#L634), [tests.test_exceptions](src/cachew/tests/test_cachew.py#L1122)
+    * [@dataclass and NamedTuple](src/cachew/tests/test_cachew.py#L599)
+    * [Optional](src/cachew/tests/test_cachew.py#L528) types
+    * [Union](src/cachew/tests/test_cachew.py#L829) types
+    * [nested datatypes](src/cachew/tests/test_cachew.py#L444)
 
-* detects [datatype schema changes](src/cachew/tests/test_cachew.py#L476) and discards old data automatically
+* detects [datatype schema changes](src/cachew/tests/test_cachew.py#L474) and discards old data automatically
 
 
 # Performance
@@ -165,20 +165,20 @@ You can find some of my performance tests in [benchmarks/](benchmarks) dir, and
 
 
 # Using
-See [docstring](src/cachew/__init__.py#L292) for up-to-date documentation on parameters and return types.
+See [docstring](src/cachew/__init__.py#L277) for up-to-date documentation on parameters and return types.
 You can also use [extensive unit tests](src/cachew/tests/test_cachew.py) as a reference.
 
 Some useful (but optional) arguments of `@cachew` decorator:
 
-* `cache_path` can be a directory, or a callable that [returns a path](src/cachew/tests/test_cachew.py#L423) and depends on function's arguments.
+* `cache_path` can be a directory, or a callable that [returns a path](src/cachew/tests/test_cachew.py#L421) and depends on function's arguments.
 
    By default, `settings.DEFAULT_CACHEW_DIR` is used.
 
 * `depends_on` is a function which determines whether your inputs have changed, and the cache needs to be invalidated.
 
    By default it just uses string representation of the arguments, you can also specify a custom callable.
 
-   For instance, it can be used to [discard cache](src/cachew/tests/test_cachew.py#L120) if the input file was modified.
+   For instance, it can be used to [discard cache](src/cachew/tests/test_cachew.py#L118) if the input file was modified.
 
 * `cls` is the type that would be serialized.
 
@@ -258,7 +258,10 @@ def mcachew(*args, **kwargs):
     except ModuleNotFoundError:
         import warnings
 
-        warnings.warn('cachew library not found. You might want to install it to speed things up. See https://github.com/karlicoss/cachew')
+        warnings.warn(
+            'cachew library not found. You might want to install it to speed things up. See https://github.com/karlicoss/cachew',
+            stacklevel=2,
+        )
         return lambda orig_func: orig_func
     else:
         return cachew.cachew(*args, **kwargs)
@@ -271,9 +274,9 @@ Now you can use `@mcachew` in place of `@cachew`, and be certain things don't br
 ## Settings
 
 
-[cachew.settings](src/cachew/__init__.py#L64) exposes some parameters that allow you to control `cachew` behaviour:
+[cachew.settings](src/cachew/__init__.py#L61) exposes some parameters that allow you to control `cachew` behaviour:
 - `ENABLE`: set to `False` if you want to disable caching for without removing the decorators (useful for testing and debugging).
-   You can also use [cachew.extra.disabled_cachew](src/cachew/extra.py#L21) context manager to do it temporarily.
+   You can also use [cachew.extra.disabled_cachew](src/cachew/extra.py#L24) context manager to do it temporarily.
 - `DEFAULT_CACHEW_DIR`: override to set a different base directory. The default is the "user cache directory" (see [platformdirs docs](https://github.com/tox-dev/platformdirs?tab=readme-ov-file#example-output)).
 - `THROW_ON_ERROR`: by default, cachew is defensive and simply attemps to cause the original function on caching issues.
    Set to `True` to catch errors earlier.

conftest.py

@@ -4,7 +4,6 @@
 
 import os
 import pathlib
-from typing import Optional
 
 import _pytest.main
 import _pytest.pathlib
@@ -22,7 +21,7 @@
 resolve_pkg_path_orig = _pytest.pathlib.resolve_package_path
 
 
-def resolve_package_path(path: pathlib.Path) -> Optional[pathlib.Path]:
+def resolve_package_path(path: pathlib.Path) -> pathlib.Path | None:
     result = path  # search from the test file upwards
     for parent in result.parents:
         if str(parent) in namespace_pkg_dirs:

doc/test_serialization.py

@@ -49,7 +49,7 @@ class Country:
     @dataclass_json
     @dataclass
     class WithUnion:
-        union: Union[City, Country]
+        union: Union[City, Country]  # noqa: UP007
 
     objs = [
         WithUnion(union=City(name='London')),
@@ -87,7 +87,7 @@ class Country:
 
     @dataclass
     class WithUnion:
-        union: Union[City, Country]
+        union: Union[City, Country]  # noqa: UP007
 
     objs = [
         WithUnion(union=City(name="London")),
@@ -123,7 +123,7 @@ class Country:
 
     @dataclass
     class WithUnion:
-        union: Union[City, Country]
+        union: Union[City, Country]  # noqa: UP007
 
     objs = [
         WithUnion(union=City(name="London")),
@@ -177,7 +177,7 @@ class Country:
 
     @dataclass
     class WithUnion:
-        union: Union[City, Country]
+        union: Union[City, Country]  # noqa: UP007
 
     objs = [
         WithUnion(union=City(name="London")),

pyproject.toml

@@ -8,7 +8,7 @@ dependencies = [
     "orjson",           # fast json serialization
     "typing-extensions",# for depreceated decorator
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 ## these need to be set if you're planning to upload to pypi
 # description = "TODO"

ruff.toml

@@ -4,11 +4,6 @@ lint.extend-select = [
     "ALL",
 ]
 
-# Preserve types, even if a file imports `from __future__ import annotations`
-# we need this for cachew to work with HPI types on 3.9
-# can probably remove after 3.10?
-lint.pyupgrade.keep-runtime-typing = true
-
 lint.ignore = [
     "D",     # annoying nags about docstrings
     "N",     # pep naming
@@ -106,4 +101,5 @@ lint.ignore = [
 
 
 extend-exclude = [
+    "src/cachew/legacy.py",  # TODO dunno, remove it for good?
 ]

src/cachew/__init__.py

@@ -6,20 +6,17 @@
 import logging
 import os
 import stat
-import sys
 import warnings
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Generic,
     Literal,
-    Optional,
+    ParamSpec,
     TypeVar,
-    Union,
     cast,
     get_args,
     get_origin,
@@ -56,7 +53,7 @@ def orjson_dumps(*args, **kwargs):  # type: ignore[misc]
 # in case of changes in the way cachew stores data, this should be changed to discard old caches
 CACHEW_VERSION: str = importlib.metadata.version(__name__)
 
-PathIsh = Union[Path, str]
+PathIsh = Path | str
 
 Backend = Literal['sqlite', 'file']
 
@@ -92,22 +89,10 @@ def get_logger() -> logging.Logger:
 
 
 R = TypeVar('R')
-# ugh. python < 3.10 doesn't have ParamSpec and it seems tricky to backport it in compatible manner
-if sys.version_info[:2] >= (3, 10) or TYPE_CHECKING:
-    if sys.version_info[:2] >= (3, 10):
-        from typing import ParamSpec
-    else:
-        from typing_extensions import ParamSpec
-    P = ParamSpec('P')
-    CC = Callable[P, R]  # need to give it a name, if inlined into bound=, mypy runs in a bug
-    PathProvider = Union[PathIsh, Callable[P, PathIsh]]
-    HashFunction = Callable[P, SourceHash]
-else:
-    # just use some dummy types so runtime is happy
-    P = TypeVar('P')
-    CC = Any
-    PathProvider = Union[P, Any]
-    HashFunction = Union[P, Any]
+P = ParamSpec('P')
+CC = Callable[P, R]  # need to give it a name, if inlined into bound=, mypy runs in a bug
+PathProvider = PathIsh | Callable[P, PathIsh]
+HashFunction = Callable[P, SourceHash]
 
 F = TypeVar('F', bound=CC)
 
@@ -129,7 +114,7 @@ def mtime_hash(path: Path, *args, **kwargs) -> SourceHash:
 Inferred = tuple[Kind, type[Any]]
 
 
-def infer_return_type(func) -> Union[Failure, Inferred]:
+def infer_return_type(func) -> Failure | Inferred:
     """
     >>> def const() -> int:
     ...     return 123
@@ -292,21 +277,21 @@ def cachew_error(e: Exception, *, logger: logging.Logger) -> None:
 @doublewrap
 def cachew_impl(
     func=None,  # TODO should probably type it after switch to python 3.10/proper paramspec
-    cache_path: Optional[PathProvider[P]] = use_default_path,
+    cache_path: PathProvider[P] | None = use_default_path,
     *,
     force_file: bool = False,
-    cls: Optional[Union[type, tuple[Kind, type]]] = None,
+    cls: type | tuple[Kind, type] | None = None,
     depends_on: HashFunction[P] = default_hash,
-    logger: Optional[logging.Logger] = None,
+    logger: logging.Logger | None = None,
     chunk_by: int = 100,
     # NOTE: allowed values for chunk_by depend on the system.
     # some systems (to be more specific, sqlite builds), it might be too large and cause issues
     # ideally this would be more defensive/autodetected, maybe with a warning?
     # you can use 'test_many' to experiment
     # - too small values (e.g. 10)  are slower than 100 (presumably, too many sql statements)
     # - too large values (e.g. 10K) are slightly slower as well (not sure why?)
-    synthetic_key: Optional[str] = None,
-    backend: Optional[Backend] = None,
+    synthetic_key: str | None = None,
+    backend: Backend | None = None,
     **kwargs,
 ):
     r"""
@@ -383,8 +368,8 @@ def process(self, msg, kwargs):
         cache_path = settings.DEFAULT_CACHEW_DIR
         logger.debug(f'no cache_path specified, using the default {cache_path}')
 
-    use_kind: Optional[Kind] = None
-    use_cls: Optional[type] = None
+    use_kind: Kind | None = None
+    use_cls: type | None = None
     if cls is not None:
         # defensive here since typing. objects passed as cls might fail on isinstance
         try:
@@ -469,15 +454,15 @@ def cachew(fun: F) -> F: ...
     # but at least it works for checking that cachew_path and depdns_on have the same args :shrug:
     @overload
     def cachew(
-        cache_path: Optional[PathProvider[P]] = ...,
+        cache_path: PathProvider[P] | None = ...,
         *,
         force_file: bool = ...,
-        cls: Optional[Union[type, tuple[Kind, type]]] = ...,
+        cls: type | tuple[Kind, type] | None = ...,
         depends_on: HashFunction[P] = ...,
-        logger: Optional[logging.Logger] = ...,
+        logger: logging.Logger | None = ...,
         chunk_by: int = ...,
-        synthetic_key: Optional[str] = ...,
-        backend: Optional[Backend] = ...,
+        synthetic_key: str | None = ...,
+        backend: Backend | None = ...,
     ) -> Callable[[F], F]: ...
 
     def cachew(*args, **kwargs):  # make ty happy
@@ -492,12 +477,12 @@ def callable_name(func: Callable) -> str:
     return f'{mod}:{getattr(func, "__qualname__")}'
 
 
-def callable_module_name(func: Callable) -> Optional[str]:
+def callable_module_name(func: Callable) -> str | None:
     return getattr(func, '__module__', None)
 
 
 # could cache this, but might be worth not to, so the user can change it on the fly?
-def _parse_disabled_modules(logger: Optional[logging.Logger] = None) -> list[str]:
+def _parse_disabled_modules(logger: logging.Logger | None = None) -> list[str]:
     # e.g. CACHEW_DISABLE=my.browser:my.reddit
     if 'CACHEW_DISABLE' not in os.environ:
         return []
@@ -550,7 +535,7 @@ def _matches_disabled_module(module_name: str, pattern: str) -> bool:
     if len(module_parts) < len(pattern_parts):
         return False
 
-    for mp, pp in zip(module_parts, pattern_parts):
+    for mp, pp in zip(module_parts, pattern_parts, strict=False):
         if fnmatch.fnmatch(mp, pp):
             continue
         return False
@@ -584,8 +569,8 @@ class Context(Generic[P]):
     depends_on   : HashFunction[P]
     logger       : logging.Logger
     chunk_by     : int
-    synthetic_key: Optional[str]
-    backend      : Optional[Backend]
+    synthetic_key: str | None
+    backend      : Backend | None
 
     def composite_hash(self, *args, **kwargs) -> dict[str, Any]:
         fsig = inspect.signature(self.func)
@@ -650,7 +635,7 @@ def cachew_wrapper(
         yield from func(*args, **kwargs)
         return
 
-    def get_db_path() -> Optional[Path]:
+    def get_db_path() -> Path | None:
         db_path: Path
         if callable(cache_path):
             pp = cache_path(*args, **kwargs)
@@ -708,7 +693,7 @@ def try_use_synthetic_key() -> None:
         if not cache_compatible:
             return
 
-        def missing_keys(cached: list[str], wanted: list[str]) -> Optional[list[str]]:
+        def missing_keys(cached: list[str], wanted: list[str]) -> list[str] | None:
             # FIXME assert both cached and wanted are sorted? since we rely on it
             # if not, then the user could use some custom key for caching (e.g. normalise filenames etc)
             # although in this case passing it into the function wouldn't make sense?

src/cachew/backend/common.py

@@ -2,9 +2,6 @@
 from abc import abstractmethod
 from collections.abc import Iterator, Sequence
 from pathlib import Path
-from typing import (
-    Optional,
-)
 
 from ..common import SourceHash
 
@@ -21,10 +18,10 @@ def __enter__(self):
     def __exit__(self, *args) -> None:
         raise NotImplementedError
 
-    def get_old_hash(self) -> Optional[SourceHash]:
+    def get_old_hash(self) -> SourceHash | None:
         raise NotImplementedError
 
-    def cached_blobs_total(self) -> Optional[int]:
+    def cached_blobs_total(self) -> int | None:
         raise NotImplementedError
 
     def cached_blobs(self) -> Iterator[bytes]: