Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump schematools to 6.5.1 #950

Merged
merged 5 commits into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-compose.test-openapi-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions schemas/data/scopes/index
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
2 changes: 1 addition & 1 deletion src/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions src/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
7 changes: 3 additions & 4 deletions src/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/tests/files/scopes/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Loading