diff --git a/schemas/data/scopes/DADI/openbaar b/schemas/data/scopes/DADI/openbaar new file mode 100644 index 000000000..666f6bfa1 --- /dev/null +++ b/schemas/data/scopes/DADI/openbaar @@ -0,0 +1,12 @@ +{ + "type": "scope", + "id": "OPENBAAR", + "name": "Openbaar", + "accessPackages": { + "nonProduction": "EM4W-DATA-schemascope-ot-scope_openbaar", + "production": "EM4W-DATA-schemascope-p-scope_openbaar" + }, + "owner": { + "$ref": "publishers/DADI" + } +} diff --git a/schemas/data/scopes/index b/schemas/data/scopes/index index 0967ef424..3b720bd48 100644 --- a/schemas/data/scopes/index +++ b/schemas/data/scopes/index @@ -1 +1,5 @@ -{} +{ + "DADI": [ + "openbaar" + ] +} diff --git a/src/requirements.in b/src/requirements.in index 683b09860..9c02ee65d 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -9,7 +9,7 @@ django-vectortiles == 1.0.1 djangorestframework == 3.15.2 djangorestframework-csv == 3.0.2 djangorestframework-gis == 1.1 -amsterdam-schema-tools[django] == 6.5.1 +amsterdam-schema-tools[django] == 6.5.2 azure-identity == 1.19.0 azure-monitor-opentelemetry == 1.6.4 cachetools == 5.5.1 diff --git a/src/requirements.txt b/src/requirements.txt index fb5ac706f..de5067031 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -4,9 +4,9 @@ # # pip-compile --allow-unsafe --generate-hashes --output-file=requirements.txt requirements.in # -amsterdam-schema-tools[django]==6.5.1 \ - --hash=sha256:00eec7141b0537260dd6b52e1f757a6032eed0d0f8f310bda4dc44d7e882b934 \ - --hash=sha256:81c85583e7c284e8c1c526ea2e7eb954f8c5d76277e05dd69b56f11a26db9d24 +amsterdam-schema-tools[django]==6.5.2 \ + --hash=sha256:8bb05277c58c8085b6ab0f1e6f7d5383f7f14b6ae6f4c22f7d74e8c867dcf974 \ + --hash=sha256:dea8107c9414efc648dbffe868d08b7fcb588b7339861a19bf7b184f09856461 # via -r requirements.in argparse==1.4.0 \ --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \ diff --git a/src/requirements_dev.txt b/src/requirements_dev.txt index de9813209..e640370c8 100644 --- a/src/requirements_dev.txt +++ b/src/requirements_dev.txt @@ -4,9 +4,9 @@ # # pip-compile --allow-unsafe --generate-hashes --output-file=requirements_dev.txt requirements_dev.in # -amsterdam-schema-tools[django]==6.5.1 \ - --hash=sha256:00eec7141b0537260dd6b52e1f757a6032eed0d0f8f310bda4dc44d7e882b934 \ - --hash=sha256:81c85583e7c284e8c1c526ea2e7eb954f8c5d76277e05dd69b56f11a26db9d24 +amsterdam-schema-tools[django]==6.5.2 \ + --hash=sha256:8bb05277c58c8085b6ab0f1e6f7d5383f7f14b6ae6f4c22f7d74e8c867dcf974 \ + --hash=sha256:dea8107c9414efc648dbffe868d08b7fcb588b7339861a19bf7b184f09856461 # via -r ./requirements.in argparse==1.4.0 \ --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \ diff --git a/src/tests/conftest.py b/src/tests/conftest.py index 633c38971..ee428718a 100644 --- a/src/tests/conftest.py +++ b/src/tests/conftest.py @@ -19,7 +19,7 @@ from rest_framework.test import APIClient, APIRequestFactory from schematools.contrib.django.models import Dataset, DynamicModel, Profile from schematools.loaders import FileSystemProfileLoader, FileSystemSchemaLoader -from schematools.types import DatasetSchema +from schematools.types import DatasetSchema, Scope from rest_framework_dso.crs import RD_NEW from tests.test_rest_framework_dso.models import Actor, Category, Location, Movie, MovieUser @@ -30,6 +30,13 @@ DATE_2021_JUNE = datetime(2021, 6, 11, 10, 0, tzinfo=get_current_timezone()) +# In test files we use a lot of non-existent scopes, so instead of writing scope +# json files we monkeypatch this method. +@pytest.fixture(autouse=True) +def patch_find_scope_by_id(monkeypatch): + monkeypatch.setattr(DatasetSchema, "_find_scope_by_id", Scope.from_string) + + @pytest.fixture() def api_rf() -> APIRequestFactory: """Request factory for APIView classes"""