diff --git a/docker-compose.test-openapi-spec.yml b/docker-compose.test-openapi-spec.yml index 6ab633b8d..58a830b73 100644 --- a/docker-compose.test-openapi-spec.yml +++ b/docker-compose.test-openapi-spec.yml @@ -14,4 +14,5 @@ services: volumes: - "./schemas/data/datasets:/usr/share/nginx/html/datasets" - "./schemas/data/publishers:/usr/share/nginx/html/publishers" + - "./schemas/data/scopes:/usr/share/nginx/html/scopes" - "./schemas/conf/default.conf:/etc/nginx/conf.d/default.conf" diff --git a/schemas/data/scopes/index b/schemas/data/scopes/index new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/schemas/data/scopes/index @@ -0,0 +1 @@ +{} diff --git a/src/requirements.in b/src/requirements.in index 721afb6c6..683b09860 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.4 +amsterdam-schema-tools[django] == 6.5.1 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 2d09e95da..fb5ac706f 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.4 \ - --hash=sha256:c2910a58405e66eddf70dc685d9fa0b81de34635544ab4aedbc245e5d3d473a7 \ - --hash=sha256:f7c5711af393a2b3b498c936f3b56cd0acd7dce34d467bb14214396227f73c39 +amsterdam-schema-tools[django]==6.5.1 \ + --hash=sha256:00eec7141b0537260dd6b52e1f757a6032eed0d0f8f310bda4dc44d7e882b934 \ + --hash=sha256:81c85583e7c284e8c1c526ea2e7eb954f8c5d76277e05dd69b56f11a26db9d24 # via -r requirements.in argparse==1.4.0 \ --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \ diff --git a/src/requirements_dev.txt b/src/requirements_dev.txt index a71c930b8..de9813209 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.4 \ - --hash=sha256:c2910a58405e66eddf70dc685d9fa0b81de34635544ab4aedbc245e5d3d473a7 \ - --hash=sha256:f7c5711af393a2b3b498c936f3b56cd0acd7dce34d467bb14214396227f73c39 +amsterdam-schema-tools[django]==6.5.1 \ + --hash=sha256:00eec7141b0537260dd6b52e1f757a6032eed0d0f8f310bda4dc44d7e882b934 \ + --hash=sha256:81c85583e7c284e8c1c526ea2e7eb954f8c5d76277e05dd69b56f11a26db9d24 # via -r ./requirements.in argparse==1.4.0 \ --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \ diff --git a/src/tests/conftest.py b/src/tests/conftest.py index 90b71350f..633c38971 100644 --- a/src/tests/conftest.py +++ b/src/tests/conftest.py @@ -548,10 +548,9 @@ def movie(category) -> Movie: @pytest.fixture() -def movies_dataset() -> Dataset: - j = json.loads((HERE / "files/datasets/movies.json").read_text()) - s = DatasetSchema.from_dict(j) - return Dataset.create_for_schema(s) +def movies_dataset(schema_loader) -> Dataset: + schema = schema_loader.get_dataset_from_file("movies.json") + return Dataset.create_for_schema(schema) @pytest.fixture diff --git a/src/tests/files/scopes/index.json b/src/tests/files/scopes/index.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/src/tests/files/scopes/index.json @@ -0,0 +1 @@ +{}