Merge pull request #167 from ecmwf-projects/template-update

Template update

Author: mcucchi9

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
-  "commit": "af202c60305a4e3fa11507357dc908cc49379a3d",
+  "commit": "ce9afbb8510935c0206746d26f05f6b80e9d0087",
   "checkout": null,
   "context": {
     "cookiecutter": {

.github/workflows/on-push.yml

@@ -33,6 +33,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
     - name: Install conda-merge
       run: |
         python -m pip install conda-merge
@@ -186,6 +189,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: Install package
       run: |
         python -m pip install --upgrade pip

.pre-commit-config.yaml

@@ -8,13 +8,14 @@ repos:
   - id: check-yaml
   - id: check-toml
   - id: check-added-large-files
+  - id: check-merge-conflict
   - id: debug-statements
   - id: mixed-line-ending
 - repo: https://github.com/keewis/blackdoc
   rev: v0.3.9
   hooks:
   - id: blackdoc
-    additional_dependencies: [black==22.3.0]
+    additional_dependencies: [black==23.11.0]
 - repo: https://github.com/astral-sh/ruff-pre-commit
   rev: v0.1.5
   hooks:

cads_processing_api_service/auth.py

@@ -33,12 +33,12 @@
 
 
 def get_auth_header(
-    pat: str
-    | None = fastapi.Header(
+    pat: str | None = fastapi.Header(
         None, description="Personal Access Token", alias="PRIVATE-TOKEN"
     ),
-    jwt: str
-    | None = fastapi.Header(None, description="JSON Web Token", alias="Authorization"),
+    jwt: str | None = fastapi.Header(
+        None, description="JSON Web Token", alias="Authorization"
+    ),
 ) -> tuple[str, str]:
     """Get authentication header from the incoming HTTP request.
 

cads_processing_api_service/utils.py

@@ -49,7 +49,7 @@ class JobSortCriterion(str, enum.Enum):
     created_at_desc: str = "-created"
 
 
-@cachetools.cached(  # type: ignore
+@cachetools.cached(
     cache=cachetools.TTLCache(
         maxsize=config.ensure_settings().cache_resources_maxsize,
         ttl=config.ensure_settings().cache_resources_ttl,
@@ -98,7 +98,7 @@ def lookup_resource_by_id(
     return row
 
 
-@cachetools.cached(  # type: ignore
+@cachetools.cached(
     cache=cachetools.TTLCache(
         maxsize=config.ensure_settings().cache_resources_maxsize,
         ttl=config.ensure_settings().cache_resources_ttl,

tests/test_30_utils.py

@@ -220,10 +220,8 @@ def test_get_job_from_broker_db() -> None:
     test_job_id = "1234"
     mock_session = unittest.mock.Mock(spec=sqlalchemy.orm.Session)
     with unittest.mock.patch("cads_broker.database.get_request") as mock_get_request:
-        mock_get_request.return_value = (
-            cads_broker.database.SystemRequest(  # type:ignore
-                request_uid=test_job_id
-            )
+        mock_get_request.return_value = cads_broker.database.SystemRequest(  # type:ignore
+            request_uid=test_job_id
         )
         job = utils.get_job_from_broker_db(test_job_id, session=mock_session)
     assert isinstance(job, cads_broker.SystemRequest)