diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml index 202ab14..7e498c2 100644 --- a/.github/workflows/cd_release.yml +++ b/.github/workflows/cd_release.yml @@ -8,7 +8,7 @@ on: jobs: release: name: External - uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.7.4 + uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.8.0 if: github.repository == 'SINTEF/entities-service' && startsWith(github.ref, 'refs/tags/v') with: # General diff --git a/.github/workflows/ci_automerge_dependencies.yml b/.github/workflows/ci_automerge_dependencies.yml index 473a751..a45d1dc 100644 --- a/.github/workflows/ci_automerge_dependencies.yml +++ b/.github/workflows/ci_automerge_dependencies.yml @@ -7,7 +7,7 @@ on: jobs: update-dependencies-branch: name: External - uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.7.4 + uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.8.0 if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'ci/update-pyproject' && github.actor == 'TEAM4-0' ) || ( github.event.pull_request.head.ref == 'pre-commit-ci-update-config' && github.actor == 'pre-commit-ci[bot]' ) ) secrets: PAT: ${{ secrets.TEAM40_PAT }} diff --git a/.github/workflows/ci_cd_updated_main.yml b/.github/workflows/ci_cd_updated_main.yml index af10b9a..99edf98 100644 --- a/.github/workflows/ci_cd_updated_main.yml +++ b/.github/workflows/ci_cd_updated_main.yml @@ -7,7 +7,7 @@ on: jobs: update-deps-branch-and-docs: name: External - uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.7.4 + uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.8.0 if: github.repository_owner == 'SINTEF' with: # General diff --git a/.github/workflows/ci_check_dependencies.yml b/.github/workflows/ci_check_dependencies.yml index 7294d27..8ecd0dc 100644 --- a/.github/workflows/ci_check_dependencies.yml +++ b/.github/workflows/ci_check_dependencies.yml @@ -9,7 +9,7 @@ on: jobs: check-dependencies: name: External - uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.7.4 + uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.8.0 if: github.repository_owner == 'SINTEF' with: git_username: "TEAM 4.0[bot]" @@ -18,5 +18,8 @@ jobs: python_version: "3.10" install_extras: "[dev]" pr_labels: "CI/CD,skip_changelog" + ignore: | + # Ignore all further major version updates for NumPy, i.e., keep it at 1.x.x + dependency-name=numpy...update-types=version-update:semver-major secrets: PAT: ${{ secrets.TEAM40_PAT }} diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 22a455a..263b573 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -10,7 +10,7 @@ on: jobs: basic-tests: name: External - uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.7.4 + uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.8.0 with: # General setup install_extras: "[dev]" diff --git a/.github/workflows/ci_update_dependencies.yml b/.github/workflows/ci_update_dependencies.yml index d2aef1b..72248d0 100644 --- a/.github/workflows/ci_update_dependencies.yml +++ b/.github/workflows/ci_update_dependencies.yml @@ -9,7 +9,7 @@ on: jobs: create-collected-pr: name: External - uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.7.4 + uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.8.0 if: github.repository_owner == 'SINTEF' with: # General diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bff94f6..d5179f2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -72,7 +72,7 @@ repos: # The project's documentation can be found at: # https://mypy.readthedocs.io/en/stable/index.html - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.11.0 + rev: v1.11.1 hooks: - id: mypy exclude: ^(docs/example|tests)/.*$ diff --git a/pyproject.toml b/pyproject.toml index 7f6a4e2..a7ea3df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,10 +42,10 @@ requires-python = "~=3.10" dynamic = ["version", "description"] dependencies = [ - "fastapi ~=0.111.0", + "fastapi ~=0.112.0", "httpx ~=0.27.0", - "pydantic-settings ~=2.3", - "pymongo ~=4.7", + "pydantic-settings ~=2.4", + "pymongo ~=4.8", "python-dotenv ~=1.0", "uvicorn >=0.24.0,<1", ] @@ -57,12 +57,12 @@ cli = [ "typer[all] >=0.9.0,<1", ] testing = [ - "cryptography ~=42.0", + "cryptography ~=43.0", "dlite-python ~=0.5.16", "mongomock ~=4.1", "numpy <2", # requirement for DLite v0.5.16, which does not support NumPy v2 - "pytest ~=8.2", - "pytest-asyncio ~=0.23.7", + "pytest ~=8.3", + "pytest-asyncio ~=0.23.8", "pytest-cov ~=5.0", "pytest-httpx ~=0.30.0", "entities-service[cli]", @@ -71,7 +71,7 @@ server = [ "gunicorn >=21.2.0,<23", ] dev = [ - "pre-commit ~=3.7", + "pre-commit ~=3.8", "entities-service[cli,testing]", ] diff --git a/tests/cli/commands/test_validate.py b/tests/cli/commands/test_validate.py index 484e3cb..a2407e1 100644 --- a/tests/cli/commands/test_validate.py +++ b/tests/cli/commands/test_validate.py @@ -1191,6 +1191,10 @@ def test_validate_strict( if index % 2 == 0: existing_entity_content = raw_entity.copy() + if id_key == "identity": + existing_entity_content["uri"] = existing_entity_content.pop("identity") + id_key = "uri" + # And for half of those, let's say they exist with different content if index % 4 == 0: if isinstance(existing_entity_content["properties"], dict):