From 9356e474a34c40fa62c879e1249e9dcfb66bf952 Mon Sep 17 00:00:00 2001 From: Pieter Stokkink Date: Mon, 17 Feb 2025 12:15:56 +0100 Subject: [PATCH 1/5] bump to v6.5 --- src/requirements.in | 2 +- src/requirements.txt | 6 +++--- src/requirements_dev.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/requirements.in b/src/requirements.in index 721afb6c6..f0e6ed594 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 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..e26003505 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 \ + --hash=sha256:60562588d2f64134481bd748e6f3afa02b84786e7ead445e78f55f76d46d26d2 \ + --hash=sha256:aaef66b9e5f2aecb00019ab87a2169a5e44c48d98ac3ba65f6dcaa555f2c9733 # 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..809ee1416 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 \ + --hash=sha256:60562588d2f64134481bd748e6f3afa02b84786e7ead445e78f55f76d46d26d2 \ + --hash=sha256:aaef66b9e5f2aecb00019ab87a2169a5e44c48d98ac3ba65f6dcaa555f2c9733 # via -r ./requirements.in argparse==1.4.0 \ --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \ From de3bdab58a88ab3e6c7fdc793cde21f31ff09a90 Mon Sep 17 00:00:00 2001 From: Pieter Stokkink Date: Tue, 18 Feb 2025 12:34:32 +0100 Subject: [PATCH 2/5] load schema with schema_loader instead of json.loads --- src/tests/conftest.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 From 20052216bce41b62d14710afbce2edba64dd6fda Mon Sep 17 00:00:00 2001 From: Pieter Stokkink Date: Wed, 19 Feb 2025 13:36:52 +0100 Subject: [PATCH 3/5] Bump to v6.5.1 --- src/requirements.in | 2 +- src/requirements.txt | 6 +++--- src/requirements_dev.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/requirements.in b/src/requirements.in index f0e6ed594..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.5 +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 e26003505..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.5 \ - --hash=sha256:60562588d2f64134481bd748e6f3afa02b84786e7ead445e78f55f76d46d26d2 \ - --hash=sha256:aaef66b9e5f2aecb00019ab87a2169a5e44c48d98ac3ba65f6dcaa555f2c9733 +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 809ee1416..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.5 \ - --hash=sha256:60562588d2f64134481bd748e6f3afa02b84786e7ead445e78f55f76d46d26d2 \ - --hash=sha256:aaef66b9e5f2aecb00019ab87a2169a5e44c48d98ac3ba65f6dcaa555f2c9733 +amsterdam-schema-tools[django]==6.5.1 \ + --hash=sha256:00eec7141b0537260dd6b52e1f757a6032eed0d0f8f310bda4dc44d7e882b934 \ + --hash=sha256:81c85583e7c284e8c1c526ea2e7eb954f8c5d76277e05dd69b56f11a26db9d24 # via -r ./requirements.in argparse==1.4.0 \ --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \ From e344ec6d449d2af2f803e28cecf37332049de0ca Mon Sep 17 00:00:00 2001 From: Pieter Stokkink Date: Wed, 19 Feb 2025 13:52:17 +0100 Subject: [PATCH 4/5] ensure scopes folder *exists* --- src/tests/files/scopes/index.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/tests/files/scopes/index.json 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 @@ +{} From 4c5077276ecaed05a424b0de6908ac68bd71a1e4 Mon Sep 17 00:00:00 2001 From: Pieter Stokkink Date: Wed, 19 Feb 2025 14:20:24 +0100 Subject: [PATCH 5/5] fix spectral test --- docker-compose.test-openapi-spec.yml | 1 + schemas/data/scopes/index | 1 + 2 files changed, 2 insertions(+) create mode 100644 schemas/data/scopes/index 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 @@ +{}