Merge branch 'lint/line-120' of https://github.com/python-cachier/cachier into lint/line-120

Author: Borda

.github/workflows/ci-test.yml

@@ -53,11 +53,10 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
+          cache: "pip"
 
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install -e . -r tests/requirements.txt
+      - name: Install package & dependencies
+        run: python -m pip install -e . -r tests/requirements.txt
 
       - name: Lower inotify instance limit (Linux only, for Issue #24 test)
         if: runner.os == 'Linux' && matrix.backend == 'local'
@@ -75,14 +74,18 @@ jobs:
           colima start
           # For testcontainers to find the Colima socket
           sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
+
+      - name: Install other test dependencies
+        if: matrix.backend != 'local'
+        run: python -m pip install -e . -r tests/requirements_${{ matrix.backend }}.txt
+
       # ToDo: find a way to cache docker images
       #- name: Cache Container Images
       #  if: matrix.backend == 'mongodb'
       #  uses: borda/cache-container-images-action@b32a5e804cb39af3c3d134fc03ab76eac0bfcfa9
       #  with:
       #    prefix-key: "mongo-db"
       #    images: mongo:latest
-
       - name: Start MongoDB in docker
         if: matrix.backend == 'mongodb'
         run: |
@@ -93,11 +96,6 @@ jobs:
           # show running containers
           docker ps -a
 
-      - name: Install MongoDB core test dependencies
-        if: matrix.backend == 'mongodb'
-        run: |
-          python -m pip install -e . -r tests/mongodb_requirements.txt
-
       - name: Unit tests (DB)
         if: matrix.backend == 'mongodb'
         run: pytest -m "mongo" --cov=cachier --cov-report=term --cov-report=xml:cov.xml
@@ -117,11 +115,6 @@ jobs:
           sleep 10
           docker ps -a
 
-      - name: Install SQL core test dependencies (SQL/Postgres)
-        if: matrix.backend == 'postgres'
-        run: |
-          python -m pip install -e . -r tests/sql_requirements.txt
-
       - name: Unit tests (SQL/Postgres)
         if: matrix.backend == 'postgres'
         env:
@@ -138,11 +131,6 @@ jobs:
           sleep 5
           docker ps -a
 
-      - name: Install Redis core test dependencies
-        if: matrix.backend == 'redis'
-        run: |
-          python -m pip install -e . -r tests/redis_requirements.txt
-
       - name: Unit tests (Redis)
         if: matrix.backend == 'redis'
         run: pytest -m redis --cov=cachier --cov-report=term --cov-report=xml:cov.xml

AGENTS.md

@@ -36,7 +36,7 @@ cachier/
 │   └── __main__.py
 ├── tests/                 # Pytest-based tests, backend-marked
 │   ├── test_*.py
-│   └── *_requirements.txt # Backend-specific test requirements
+│   └── requirements_*.txt # Backend-specific test requirements
 ├── examples/              # Usage examples
 ├── README.rst             # Main documentation
 ├── pyproject.toml         # Build, lint, type, test config
@@ -55,7 +55,7 @@ ______________________________________________________________________
    pip install .[all]
    ```
 
-   - For backend-specific dev: see `tests/*_requirements.txt`.
+   - For backend-specific dev: see `tests/requirements_*.txt`.
 
 2. **Run tests:**
 
@@ -111,7 +111,7 @@ ______________________________________________________________________
 - **Default:** Pickle (local file cache, `~/.cachier/`)
 - **Others:** Memory, MongoDB, SQL, Redis
 - **Adding a backend:** Implement in `src/cachier/cores/`, subclass `BaseCore`, add tests with appropriate markers, update docs, and CI matrix if needed.
-- **Optional dependencies:** Code/tests must gracefully skip if backend deps are missing. Install backend-specific deps via `tests/*_requirements.txt`.
+- **Optional dependencies:** Code/tests must gracefully skip if backend deps are missing. Install backend-specific deps via `tests/requirements_*.txt`.
 - **Requirements files:** `tests/sql_requirements.txt`, `tests/redis_requirements.txt` for backend-specific dependencies.
 
 ### 3. **Decorator Usage**
@@ -125,7 +125,7 @@ ______________________________________________________________________
 - **Run all tests:** `pytest`
 - **Backend-specific:** Use markers, e.g. `pytest -m mongo`, `pytest -m redis`, `pytest -m sql`
 - **Available markers:** `mongo`, `memory`, `pickle`, `redis`, `sql`, `maxage` (see `pyproject.toml`)
-- **Requirements:** See `tests/*_requirements.txt` for backend test deps.
+- **Requirements:** See `tests/requirements_*.txt` for backend test deps.
 - **CI:** Matrix covers OS/backend combinations. Mongo/SQL/Redis require Dockerized services.
 - **Missing deps:** Tests gracefully skip if optional backend dependencies are missing.
 
@@ -406,9 +406,9 @@ ______________________________________________________________________
   pip install -e .
   pip install -r tests/requirements.txt
   # For specific backends:
-  pip install -r tests/mongodb_requirements.txt
-  pip install -r tests/redis_requirements.txt
-  pip install -r tests/sql_requirements.txt
+  pip install -r tests/requirements_mongodb.txt
+  pip install -r tests/requirements_redis.txt
+  pip install -r tests/requirements_postgres.txt
   ```
 - **Run all tests:** `pytest`
 - **Run backend-specific tests:** `pytest -m <backend>` (mongo, redis, sql, memory, pickle, maxage)
@@ -421,7 +421,7 @@ ______________________________________________________________________
 - **Build package:** `python -m build`
 - **Check docs:** `python setup.py checkdocs`
 - **Run example:** `python examples/redis_example.py`
-- **Update requirements:** Edit `tests/*_requirements.txt` as needed (sql_requirements.txt, redis_requirements.txt).
+- **Update requirements:** Edit `tests/requirements_*.txt` as needed (sql_requirements.txt, redis_requirements.txt).
 
 ### Local Testing with Docker
 
@@ -488,7 +488,7 @@ ______________________________________________________________________
 
 ### b. **Best Practices for Coding Assistance Agents**
 
-- **Always check for backend-specific requirements** before running backend tests or code (see `tests/*_requirements.txt`).
+- **Always check for backend-specific requirements** before running backend tests or code (see `tests/requirements_*.txt`).
 - **When adding a backend:** Update all relevant places (core, tests, docs, CI matrix, requirements files).
 - **When editing core logic:** Ensure all backends are still supported and tested.
 - **When updating the decorator API:** Update docstrings, README, and tests.

CLAUDE.md

@@ -36,7 +36,7 @@ cachier/
 │   └── __main__.py
 ├── tests/                 # Pytest-based tests, backend-marked
 │   ├── test_*.py
-│   └── *_requirements.txt # Backend-specific test requirements
+│   └── requirements_*.txt # Backend-specific test requirements
 ├── examples/              # Usage examples
 ├── README.rst             # Main documentation
 ├── pyproject.toml         # Build, lint, type, test config
@@ -55,7 +55,7 @@ ______________________________________________________________________
    pip install .[all]
    ```
 
-   - For backend-specific dev: see `tests/*_requirements.txt`.
+   - For backend-specific dev: see `tests/requirements_*.txt`.
 
 2. **Run tests:**
 
@@ -111,7 +111,7 @@ ______________________________________________________________________
 - **Default:** Pickle (local file cache, `~/.cachier/`)
 - **Others:** Memory, MongoDB, SQL, Redis
 - **Adding a backend:** Implement in `src/cachier/cores/`, subclass `BaseCore`, add tests with appropriate markers, update docs, and CI matrix if needed.
-- **Optional dependencies:** Code/tests must gracefully skip if backend deps are missing. Install backend-specific deps via `tests/*_requirements.txt`.
+- **Optional dependencies:** Code/tests must gracefully skip if backend deps are missing. Install backend-specific deps via `tests/requirements_*.txt`.
 - **Requirements files:** `tests/sql_requirements.txt`, `tests/redis_requirements.txt` for backend-specific dependencies.
 
 ### 3. **Decorator Usage**
@@ -125,7 +125,7 @@ ______________________________________________________________________
 - **Run all tests:** `pytest`
 - **Backend-specific:** Use markers, e.g. `pytest -m mongo`, `pytest -m redis`, `pytest -m sql`
 - **Available markers:** `mongo`, `memory`, `pickle`, `redis`, `sql`, `maxage` (see `pyproject.toml`)
-- **Requirements:** See `tests/*_requirements.txt` for backend test deps.
+- **Requirements:** See `tests/requirements_*.txt` for backend test deps.
 - **CI:** Matrix covers OS/backend combinations. Mongo/SQL/Redis require Dockerized services.
 - **Missing deps:** Tests gracefully skip if optional backend dependencies are missing.
 
@@ -406,9 +406,9 @@ ______________________________________________________________________
   pip install -e .
   pip install -r tests/requirements.txt
   # For specific backends:
-  pip install -r tests/mongodb_requirements.txt
-  pip install -r tests/redis_requirements.txt
-  pip install -r tests/sql_requirements.txt
+  pip install -r tests/requirements_mongodb.txt
+  pip install -r tests/requirements_redis.txt
+  pip install -r tests/requirements_postgres.txt
   ```
 - **Run all tests:** `pytest`
 - **Run backend-specific tests:** `pytest -m <backend>` (mongo, redis, sql, memory, pickle, maxage)
@@ -421,7 +421,7 @@ ______________________________________________________________________
 - **Build package:** `python -m build`
 - **Check docs:** `python setup.py checkdocs`
 - **Run example:** `python examples/redis_example.py`
-- **Update requirements:** Edit `tests/*_requirements.txt` as needed (sql_requirements.txt, redis_requirements.txt).
+- **Update requirements:** Edit `tests/requirements_*.txt` as needed (sql_requirements.txt, redis_requirements.txt).
 
 ### Local Testing with Docker
 
@@ -488,7 +488,7 @@ ______________________________________________________________________
 
 ### b. **Best Practices for Claude**
 
-- **Always check for backend-specific requirements** before running backend tests or code (see `tests/*_requirements.txt`).
+- **Always check for backend-specific requirements** before running backend tests or code (see `tests/requirements_*.txt`).
 - **When adding a backend:** Update all relevant places (core, tests, docs, CI matrix, requirements files).
 - **When editing core logic:** Ensure all backends are still supported and tested.
 - **When updating the decorator API:** Update docstrings, README, and tests.

scripts/README-local-testing.md

@@ -154,9 +154,9 @@ The script automatically sets the required environment variables:
 2. **Python dependencies** - Install test requirements:
    ```bash
    pip install -r tests/requirements.txt
-   pip install -r tests/mongodb_requirements.txt  # For MongoDB tests
-   pip install -r tests/redis_requirements.txt    # For Redis tests
-   pip install -r tests/sql_requirements.txt      # For SQL tests
+   pip install -r tests/requirements_mongodb.txt  # For MongoDB tests
+   pip install -r tests/requirements_redis.txt    # For Redis tests
+   pip install -r tests/requirements_postgres.txt      # For SQL tests
    ```
 
 ## Troubleshooting

src/cachier/config.py

@@ -136,7 +136,10 @@ def set_global_params(**params: Any) -> None:
     import cachier
 
     valid_params = {k: v for k, v in params.items() if hasattr(cachier.config._global_params, k)}
-    cachier.config._global_params = replace(cachier.config._global_params, **valid_params)
+    cachier.config._global_params = replace(
+        cachier.config._global_params,
+        **valid_params,
+    )
 
 
 def get_default_params() -> Params:

tests/mongodb_requirements.txt tests/requirements_mongodb.txttests/mongodb_requirements.txt renamed to tests/requirements_mongodb.txt

@@ -1,4 +1,4 @@
-
+-r requirements.txt
 # to connect to the test mongodb server
 pymongo
 dnspython

tests/sql_requirements.txt tests/requirements_postgres.txttests/sql_requirements.txt renamed to tests/requirements_postgres.txt

@@ -1,3 +1,4 @@
+-r requirements.txt
 # for SQL core tests
 SQLAlchemy
 psycopg2-binary

tests/redis_requirements.txt tests/requirements_redis.txttests/redis_requirements.txt renamed to tests/requirements_redis.txt

@@ -1,3 +1,5 @@
+-r requirements.txt
+
 redis>=4.0.0
 pandas>=1.3.0
 birch>=0.0.35

tests/test_redis_core.py

@@ -429,14 +429,22 @@ def test_redis_import_warning():
     """Test that import warning is raised when redis is not available."""
     ptc = patch("cachier.cores.redis.REDIS_AVAILABLE", False)
     with ptc, pytest.warns(ImportWarning, match="`redis` was not found"):
-        _RedisCore(hash_func=None, redis_client=Mock(), wait_for_calc_timeout=None)
+        _RedisCore(
+            hash_func=None,
+            redis_client=Mock(),
+            wait_for_calc_timeout=None,
+        )
 
 
 @pytest.mark.redis
 def test_missing_redis_client():
     """Test MissingRedisClient exception when redis_client is None."""
     with pytest.raises(MissingRedisClient, match="must specify ``redis_client``"):
-        _RedisCore(hash_func=None, redis_client=None, wait_for_calc_timeout=None)
+        _RedisCore(
+            hash_func=None,
+            redis_client=None,
+            wait_for_calc_timeout=None,
+        )
 
 
 @pytest.mark.redis
@@ -451,7 +459,11 @@ def test_redis_core_exceptions():
     mock_client.keys = MagicMock(side_effect=Exception("Redis keys error"))
     mock_client.delete = MagicMock(side_effect=Exception("Redis delete error"))
 
-    core = _RedisCore(hash_func=None, redis_client=mock_client, wait_for_calc_timeout=10)
+    core = _RedisCore(
+        hash_func=None,
+        redis_client=mock_client,
+        wait_for_calc_timeout=10,
+    )
 
     # Set a mock function
     def mock_func():
@@ -474,7 +486,11 @@ def mock_func():
     test_mock_client.hset = MagicMock(side_effect=Exception("Redis write error"))
 
     # Create a new core with this specific mock
-    test_core = _RedisCore(hash_func=None, redis_client=test_mock_client, wait_for_calc_timeout=10)
+    test_core = _RedisCore(
+        hash_func=None,
+        redis_client=test_mock_client,
+        wait_for_calc_timeout=10,
+    )
     test_core.set_func(mock_func)
 
     # Override _should_store to return True
@@ -529,7 +545,11 @@ def test_redis_delete_stale_entries():
     """Test delete_stale_entries method with various scenarios."""
     mock_client = MagicMock()
 
-    core = _RedisCore(hash_func=None, redis_client=mock_client, wait_for_calc_timeout=10)
+    core = _RedisCore(
+        hash_func=None,
+        redis_client=mock_client,
+        wait_for_calc_timeout=10,
+    )
 
     # Set a mock function
     def mock_func():
@@ -561,7 +581,11 @@ def mock_func():
     delete_mock_client.delete = MagicMock()
 
     # Create a new core for this test
-    delete_core = _RedisCore(hash_func=None, redis_client=delete_mock_client, wait_for_calc_timeout=10)
+    delete_core = _RedisCore(
+        hash_func=None,
+        redis_client=delete_mock_client,
+        wait_for_calc_timeout=10,
+    )
     delete_core.set_func(mock_func)
 
     # Need to mock _resolve_redis_client to return our mock
@@ -613,7 +637,11 @@ def test_redis_wait_on_entry_calc_no_entry():
     def mock_get_entry_by_key(self, key):
         return key, None
 
-    core = _RedisCore(hash_func=None, redis_client=mock_client, wait_for_calc_timeout=10)
+    core = _RedisCore(
+        hash_func=None,
+        redis_client=mock_client,
+        wait_for_calc_timeout=10,
+    )
 
     # Set a mock function
     def mock_func():
@@ -634,7 +662,11 @@ def test_redis_set_entry_should_not_store():
     """Test set_entry when value should not be stored (None not allowed)."""
     mock_client = MagicMock()
 
-    core = _RedisCore(hash_func=None, redis_client=mock_client, wait_for_calc_timeout=10)
+    core = _RedisCore(
+        hash_func=None,
+        redis_client=mock_client,
+        wait_for_calc_timeout=10,
+    )
 
     # Mock _should_store to return False
     core._should_store = Mock(return_value=False)
@@ -665,7 +697,11 @@ def test_redis_clear_being_calculated_with_pipeline():
     pipeline_mock.hset = MagicMock()
     pipeline_mock.execute = MagicMock()
 
-    core = _RedisCore(hash_func=None, redis_client=pipeline_mock_client, wait_for_calc_timeout=10)
+    core = _RedisCore(
+        hash_func=None,
+        redis_client=pipeline_mock_client,
+        wait_for_calc_timeout=10,
+    )
 
     # Set a mock function
     def mock_func():