From 791c6f7dd3b55b1f8ba93989bbe97d0f38f76ba9 Mon Sep 17 00:00:00 2001 From: Lukas Phaf Date: Thu, 26 Oct 2023 17:24:51 +0200 Subject: [PATCH 1/3] Correct order in LandingPageModel --- src/edr_pydantic/capabilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edr_pydantic/capabilities.py b/src/edr_pydantic/capabilities.py index 0219dbf..4e1f700 100644 --- a/src/edr_pydantic/capabilities.py +++ b/src/edr_pydantic/capabilities.py @@ -26,9 +26,9 @@ class Contact(EdrBaseModel): class LandingPageModel(EdrBaseModel): - links: List[Link] title: Optional[str] = None description: Optional[str] = None + links: List[Link] keywords: Optional[List[str]] = None provider: Optional[Provider] = None contact: Optional[Contact] = None From 4b7297f9d8cac2389c4e16c0c9692a3a163a94ad Mon Sep 17 00:00:00 2001 From: Lukas Phaf Date: Thu, 26 Oct 2023 17:32:42 +0200 Subject: [PATCH 2/3] Bump version and update README with related projects. --- README.md | 4 ++++ pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0bcc34d..41f498b 100644 --- a/README.md +++ b/README.md @@ -166,6 +166,10 @@ pytest tests/ This library is used to build an Environmental Data Retrieval (EDR) API, serving observation data from surface weather data station data from the KNMI. See the [KNMI Data Platform](https://developer.dataplatform.knmi.nl/edr-api). +## Related projects +* [CoverageJSON Pydantic](https://github.com/KNMI/covjson-pydantic) +* [geojson-pydantic](https://github.com/developmentseed/geojson-pydantic) + ## TODOs Help is wanted in the following areas to fully implement the EDR spec: * See TODOs in code listing various small inconsistencies in the spec diff --git a/pyproject.toml b/pyproject.toml index cd4c87c..fc3dab1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ classifiers = [ "Topic :: Scientific/Engineering :: GIS", "Typing :: Typed", ] -version = "0.2.0" +version = "0.2.1" dependencies = ["pydantic>=2.3,<3"] [project.optional-dependencies] From 89572451ef7620681628440fa9e1cfe93975e249 Mon Sep 17 00:00:00 2001 From: Lukas Phaf Date: Thu, 26 Oct 2023 17:34:39 +0200 Subject: [PATCH 3/3] Fix test. --- tests/test_data/landing-page.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_data/landing-page.json b/tests/test_data/landing-page.json index 40cc3a2..4c3a173 100644 --- a/tests/test_data/landing-page.json +++ b/tests/test_data/landing-page.json @@ -1,4 +1,6 @@ { + "title": "Observations API EDR", + "description": "The observation api in EDR format from the KNMI", "links": [ { "href": "https://api.dataplatform.knmi.nl/edr/", @@ -26,8 +28,6 @@ "title": "Collections metadata in JSON" } ], - "title": "Observations API EDR", - "description": "The observation api in EDR format from the KNMI", "keywords": [ "Weather", "Temperature",