Merge pull request #17 from ESPRI-Mod/dev

Dev

Author: SebastienGardoll

.pre-commit-config.yaml

@@ -22,14 +22,6 @@ repos:
       - id: ruff
         name: ruff-sort-imports
         args: [--select, I, --fix]
-  - repo: local
-    hooks:
-    -   id: wily
-        name: wily
-        entry: wily diff
-        verbose: true
-        language: python
-        additional_dependencies: [wily]
   - repo: https://github.com/PyCQA/flake8
     rev: 7.1.2
     hooks:

README.md

@@ -16,7 +16,6 @@ pre-commit install
 
 ```bash
 uv sync
-uv run wily setup
 uv run pre-commit install
 ```
 

deployment/check_update.sh

@@ -7,8 +7,8 @@ set -u
 readonly BASE_DIR_PATH="$(pwd)"
 SCRIPT_DIR_PATH="$(dirname $0)"; cd "${SCRIPT_DIR_PATH}"
 readonly SCRIPT_DIR_PATH="$(pwd)"; cd "${BASE_DIR_PATH}"
-readonly DOCKER_PROD_SERVICE_NAME='prod'
-readonly DOCKER_UPDATE_SERVICE_NAME='update'
+readonly DOCKER_PROD_SERVICE_NAME='bprod'
+readonly DOCKER_UPDATE_SERVICE_NAME='bupdate'
 readonly EMAIL_ADDRESSES='sgardoll@ipsl.fr,laurent.troussellier@ipsl.fr'
 readonly EMAIL_SUBJECT_TAG='[ESGVOC BACKEND][UPDATE]'
 readonly UPDATE_MARK_FILE_PATH="${SCRIPT_DIR_PATH}/update/mark"

pyproject.toml

@@ -43,7 +43,6 @@ dev = [
     "httpx>=0.28.1",
     "hatch>=1.14.0", # Required for version updating through uv.
     "pytest-cov>=6.0.0",
-    "wily>=1.25.0",
     "flake8>=7.1.2",
     "pyright>=1.1.396",
     "uvicorn>=0.34.0",

src/esgvoc_backend/__init__.py

@@ -3,7 +3,7 @@
 
 from esgvoc_backend import constants
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 logging_config = {
     'version': 1,

tests/api_inputs.py

@@ -1,30 +1,18 @@
-from typing import Generator
-
 import pytest
 
 from esgvoc_backend import jsg
 from tests.utils import _test_get, client_factory
 
 router = jsg.router
 
-JSG_PROJECT_IDS = ["cmip6"]
-
 
 @pytest.fixture(scope='module')
 def client(request):
     return client_factory(request, router)
 
 
-def _provide_get_jsg_project_ids() -> Generator:
-    for param in JSG_PROJECT_IDS:
-        yield param
-
-@pytest.fixture(params=_provide_get_jsg_project_ids())
-def jsg_project_id(request) -> str:
-    return request.param
-
-
-def test_js_generation(client, jsg_project_id) -> None:
-    url = f'/{jsg_project_id}'
+def test_cmip6_js_generation(client) -> None:
+    project_id = 'cmip6'
+    url = f'/{project_id}'
     json_result = _test_get(client=client, url=url, params=None, select=False, id=None)
     assert json_result

tests/test_js_generator.py

@@ -17,7 +17,8 @@ def client(request):
 
 
 def _test_validation(client: httpx.Client, url: str, params: dict,
-                     query: ValidationExpression, check_in_all_projects: bool = False) -> None:
+                     query: ValidationExpression, check_in_collection: bool = False,
+                     check_in_all_projects: bool = False) -> None:
     results = client.get(url=url, params=params)
     results.raise_for_status()
     json_results = results.json()
@@ -26,7 +27,8 @@ def _test_validation(client: httpx.Client, url: str, params: dict,
         matching_terms = list()
     elif not isinstance(matching_terms, list):
         matching_terms = [matching_terms]
-    check_validation(query, cast(list[MatchingTerm], matching_terms), check_in_all_projects)
+    check_validation(query, cast(list[MatchingTerm], matching_terms), check_in_collection,
+                     check_in_all_projects)
 
 
 def test_valid_term_all_projects(client, val_query) -> None:
@@ -38,7 +40,7 @@ def test_valid_term_all_projects(client, val_query) -> None:
 def test_valid_term_in_project(client, val_query) -> None:
     url = '/term'
     params = {'value': val_query.value, 'project_id': val_query.item.project_id}
-    _test_validation(client=client, url=url, params=params, query=val_query)
+    _test_validation(client=client, url=url, params=params, query=val_query, check_in_collection=True)
 
 
 def test_valid_term_in_collection(client, val_query) -> None: