From 8ebcea7e124babe793fefce24f315e1a7e3d353a Mon Sep 17 00:00:00 2001 From: Jonatan Skogsfors Date: Fri, 10 Oct 2025 14:50:55 +0200 Subject: [PATCH] Rename proejct --- README.md | 2 +- pyproject.toml | 4 +- requirements.txt | 8 +-- src/delivery_metadata/__init__.py | 1 - src/shark_metadata/__init__.py | 0 .../dcat_ap_se/0_template.yaml | 0 .../dcat_ap_se/datahost.yaml | 0 .../dcat_ap_se/geographic_coverage.yaml | 0 .../dcat_ap_se/keywords.yaml | 0 .../dcat_ap_se/laboratory.yaml | 0 .../dcat_ap_se/license.yaml | 0 .../dcat_ap_se/metadata_template.yaml | 0 .../dcat_ap_se/methods.yaml | 0 .../dcat_ap_se/orderer.yaml | 0 .../dcat_ap_se/purpose.yaml | 0 .../dcat_ap_se/titles.yaml | 0 .../dcat_ap_se/url_linkage.yaml | 0 .../delivery_data.py | 0 .../generate_text_file_from_yaml.py | 0 .../metadata_from_package.py | 2 +- .../shark_package/abstract.yaml | 0 .../shark_package/discipline.yaml | 0 .../shark_package/misc.yaml | 0 .../shark_package/originator_contact.yaml | 0 .../shark_package/readme.yaml | 0 tests/test_parse_shark_data.py | 2 +- tests/test_write_metadata.py | 2 +- uv.lock | 70 +++++++++---------- 28 files changed, 45 insertions(+), 46 deletions(-) delete mode 100644 src/delivery_metadata/__init__.py create mode 100644 src/shark_metadata/__init__.py rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/0_template.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/datahost.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/geographic_coverage.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/keywords.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/laboratory.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/license.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/metadata_template.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/methods.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/orderer.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/purpose.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/titles.yaml (100%) rename src/{delivery_metadata => shark_metadata}/dcat_ap_se/url_linkage.yaml (100%) rename src/{delivery_metadata => shark_metadata}/delivery_data.py (100%) rename src/{delivery_metadata => shark_metadata}/generate_text_file_from_yaml.py (100%) rename src/{delivery_metadata => shark_metadata}/metadata_from_package.py (86%) rename src/{delivery_metadata => shark_metadata}/shark_package/abstract.yaml (100%) rename src/{delivery_metadata => shark_metadata}/shark_package/discipline.yaml (100%) rename src/{delivery_metadata => shark_metadata}/shark_package/misc.yaml (100%) rename src/{delivery_metadata => shark_metadata}/shark_package/originator_contact.yaml (100%) rename src/{delivery_metadata => shark_metadata}/shark_package/readme.yaml (100%) diff --git a/README.md b/README.md index 825f880..27076e6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# metadata +# delivery-metadata Used for metadata for DCAT-AP-SE and DarwinCore-EML. diff --git a/pyproject.toml b/pyproject.toml index 57c97b7..97bd35c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "delivery-metadata" +name = "shark-metadata" version = "2025.1.0" authors = [ {name="Mikael Hedblom", email="mikael.hedblom@smhi.se"}, @@ -18,7 +18,7 @@ license = {file = "LICENSE"} [project.scripts] -metadata-from-package = "delivery_metadata.metadata_from_package:cli" +metadata-from-package = "shark_metadata.metadata_from_package:cli" [dependency-groups] dev = [ diff --git a/requirements.txt b/requirements.txt index 25d804d..cc0723a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -64,7 +64,7 @@ click==8.3.0 \ --hash=sha256:9b9f285302c6e3064f4330c05f05b81945b2a39544279343e6e7c5f27a9baddc \ --hash=sha256:e7b8232224eba16f4ebe410c25ced9f7875cb5f3263ffc93cc3e8da705e229c4 # via - # delivery-metadata + # shark-metadata # typer colorama==0.4.6 ; sys_platform == 'win32' \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ @@ -147,7 +147,7 @@ mdurl==0.1.2 \ --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba # via markdown-it-py nodc-codes @ git+https://github.com/nodc-sweden/nodc-codes@5e0a3f6a0900b3c34b9f8e0689f5c1daeb38ef9a - # via delivery-metadata + # via shark-metadata nodc-station @ git+https://github.com/nodc-sweden/nodc-station@e0cbf9cda7081f0edd7aa78330c35ea00dabb8bb # via sharkadm nodeenv==1.9.1 \ @@ -496,8 +496,8 @@ pyyaml==6.0.3 \ --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \ --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0 # via - # delivery-metadata # pre-commit + # shark-metadata # sharkadm requests==2.32.5 \ --hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \ @@ -585,7 +585,7 @@ shapely==2.1.2 \ # geopandas # sharkadm sharkadm @ git+https://github.com/nodc-sweden/SHARKadm@7f9cc05006425e6a463e8ddc00df3d4ac9ab8606 - # via delivery-metadata + # via shark-metadata shellingham==1.5.4 \ --hash=sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686 \ --hash=sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de diff --git a/src/delivery_metadata/__init__.py b/src/delivery_metadata/__init__.py deleted file mode 100644 index 5b9ecd1..0000000 --- a/src/delivery_metadata/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from delivery_metadata.delivery_data import DeliveryData diff --git a/src/shark_metadata/__init__.py b/src/shark_metadata/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/delivery_metadata/dcat_ap_se/0_template.yaml b/src/shark_metadata/dcat_ap_se/0_template.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/0_template.yaml rename to src/shark_metadata/dcat_ap_se/0_template.yaml diff --git a/src/delivery_metadata/dcat_ap_se/datahost.yaml b/src/shark_metadata/dcat_ap_se/datahost.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/datahost.yaml rename to src/shark_metadata/dcat_ap_se/datahost.yaml diff --git a/src/delivery_metadata/dcat_ap_se/geographic_coverage.yaml b/src/shark_metadata/dcat_ap_se/geographic_coverage.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/geographic_coverage.yaml rename to src/shark_metadata/dcat_ap_se/geographic_coverage.yaml diff --git a/src/delivery_metadata/dcat_ap_se/keywords.yaml b/src/shark_metadata/dcat_ap_se/keywords.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/keywords.yaml rename to src/shark_metadata/dcat_ap_se/keywords.yaml diff --git a/src/delivery_metadata/dcat_ap_se/laboratory.yaml b/src/shark_metadata/dcat_ap_se/laboratory.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/laboratory.yaml rename to src/shark_metadata/dcat_ap_se/laboratory.yaml diff --git a/src/delivery_metadata/dcat_ap_se/license.yaml b/src/shark_metadata/dcat_ap_se/license.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/license.yaml rename to src/shark_metadata/dcat_ap_se/license.yaml diff --git a/src/delivery_metadata/dcat_ap_se/metadata_template.yaml b/src/shark_metadata/dcat_ap_se/metadata_template.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/metadata_template.yaml rename to src/shark_metadata/dcat_ap_se/metadata_template.yaml diff --git a/src/delivery_metadata/dcat_ap_se/methods.yaml b/src/shark_metadata/dcat_ap_se/methods.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/methods.yaml rename to src/shark_metadata/dcat_ap_se/methods.yaml diff --git a/src/delivery_metadata/dcat_ap_se/orderer.yaml b/src/shark_metadata/dcat_ap_se/orderer.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/orderer.yaml rename to src/shark_metadata/dcat_ap_se/orderer.yaml diff --git a/src/delivery_metadata/dcat_ap_se/purpose.yaml b/src/shark_metadata/dcat_ap_se/purpose.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/purpose.yaml rename to src/shark_metadata/dcat_ap_se/purpose.yaml diff --git a/src/delivery_metadata/dcat_ap_se/titles.yaml b/src/shark_metadata/dcat_ap_se/titles.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/titles.yaml rename to src/shark_metadata/dcat_ap_se/titles.yaml diff --git a/src/delivery_metadata/dcat_ap_se/url_linkage.yaml b/src/shark_metadata/dcat_ap_se/url_linkage.yaml similarity index 100% rename from src/delivery_metadata/dcat_ap_se/url_linkage.yaml rename to src/shark_metadata/dcat_ap_se/url_linkage.yaml diff --git a/src/delivery_metadata/delivery_data.py b/src/shark_metadata/delivery_data.py similarity index 100% rename from src/delivery_metadata/delivery_data.py rename to src/shark_metadata/delivery_data.py diff --git a/src/delivery_metadata/generate_text_file_from_yaml.py b/src/shark_metadata/generate_text_file_from_yaml.py similarity index 100% rename from src/delivery_metadata/generate_text_file_from_yaml.py rename to src/shark_metadata/generate_text_file_from_yaml.py diff --git a/src/delivery_metadata/metadata_from_package.py b/src/shark_metadata/metadata_from_package.py similarity index 86% rename from src/delivery_metadata/metadata_from_package.py rename to src/shark_metadata/metadata_from_package.py index c6e6ac6..6d37b1c 100644 --- a/src/delivery_metadata/metadata_from_package.py +++ b/src/shark_metadata/metadata_from_package.py @@ -3,7 +3,7 @@ import click -from delivery_metadata import DeliveryData +from shark_metadata.delivery_data import DeliveryData @click.command() diff --git a/src/delivery_metadata/shark_package/abstract.yaml b/src/shark_metadata/shark_package/abstract.yaml similarity index 100% rename from src/delivery_metadata/shark_package/abstract.yaml rename to src/shark_metadata/shark_package/abstract.yaml diff --git a/src/delivery_metadata/shark_package/discipline.yaml b/src/shark_metadata/shark_package/discipline.yaml similarity index 100% rename from src/delivery_metadata/shark_package/discipline.yaml rename to src/shark_metadata/shark_package/discipline.yaml diff --git a/src/delivery_metadata/shark_package/misc.yaml b/src/shark_metadata/shark_package/misc.yaml similarity index 100% rename from src/delivery_metadata/shark_package/misc.yaml rename to src/shark_metadata/shark_package/misc.yaml diff --git a/src/delivery_metadata/shark_package/originator_contact.yaml b/src/shark_metadata/shark_package/originator_contact.yaml similarity index 100% rename from src/delivery_metadata/shark_package/originator_contact.yaml rename to src/shark_metadata/shark_package/originator_contact.yaml diff --git a/src/delivery_metadata/shark_package/readme.yaml b/src/shark_metadata/shark_package/readme.yaml similarity index 100% rename from src/delivery_metadata/shark_package/readme.yaml rename to src/shark_metadata/shark_package/readme.yaml diff --git a/tests/test_parse_shark_data.py b/tests/test_parse_shark_data.py index 8c2f107..ef23136 100644 --- a/tests/test_parse_shark_data.py +++ b/tests/test_parse_shark_data.py @@ -3,7 +3,7 @@ import polars as pl -from delivery_metadata import DeliveryData +from shark_metadata.delivery_data import DeliveryData def _write_data_to_package_folder( diff --git a/tests/test_write_metadata.py b/tests/test_write_metadata.py index 0c545d9..93d1a0b 100644 --- a/tests/test_write_metadata.py +++ b/tests/test_write_metadata.py @@ -1,4 +1,4 @@ -from delivery_metadata import DeliveryData +from shark_metadata.delivery_data import DeliveryData def test_metadata_has_expected_fields(): diff --git a/uv.lock b/uv.lock index 8a933b0..56cec9c 100644 --- a/uv.lock +++ b/uv.lock @@ -98,41 +98,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, ] -[[package]] -name = "delivery-metadata" -version = "2025.1.0" -source = { editable = "." } -dependencies = [ - { name = "click" }, - { name = "nodc-codes" }, - { name = "pyyaml" }, - { name = "sharkadm" }, -] - -[package.dev-dependencies] -dev = [ - { name = "polars" }, - { name = "pre-commit" }, - { name = "pytest" }, - { name = "ruff" }, -] - -[package.metadata] -requires-dist = [ - { name = "click", specifier = ">=8.3.0" }, - { name = "nodc-codes", git = "https://github.com/nodc-sweden/nodc-codes" }, - { name = "pyyaml", specifier = ">=6.0.3" }, - { name = "sharkadm", git = "https://github.com/nodc-sweden/SHARKadm" }, -] - -[package.metadata.requires-dev] -dev = [ - { name = "polars", specifier = ">=1.34.0" }, - { name = "pre-commit", specifier = ">=4.3.0" }, - { name = "pytest", specifier = ">=8.4.2" }, - { name = "ruff", specifier = ">=0.14.0" }, -] - [[package]] name = "distlib" version = "0.4.0" @@ -864,6 +829,41 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9a/f6/f09272a71976dfc138129b8faf435d064a811ae2f708cb147dccdf7aacdb/shapely-2.1.2-cp314-cp314t-win_amd64.whl", hash = "sha256:0036ac886e0923417932c2e6369b6c52e38e0ff5d9120b90eef5cd9a5fc5cae9", size = 1796682, upload-time = "2025-09-24T13:51:39.233Z" }, ] +[[package]] +name = "shark-metadata" +version = "2025.1.0" +source = { editable = "." } +dependencies = [ + { name = "click" }, + { name = "nodc-codes" }, + { name = "pyyaml" }, + { name = "sharkadm" }, +] + +[package.dev-dependencies] +dev = [ + { name = "polars" }, + { name = "pre-commit" }, + { name = "pytest" }, + { name = "ruff" }, +] + +[package.metadata] +requires-dist = [ + { name = "click", specifier = ">=8.3.0" }, + { name = "nodc-codes", git = "https://github.com/nodc-sweden/nodc-codes" }, + { name = "pyyaml", specifier = ">=6.0.3" }, + { name = "sharkadm", git = "https://github.com/nodc-sweden/SHARKadm" }, +] + +[package.metadata.requires-dev] +dev = [ + { name = "polars", specifier = ">=1.34.0" }, + { name = "pre-commit", specifier = ">=4.3.0" }, + { name = "pytest", specifier = ">=8.4.2" }, + { name = "ruff", specifier = ">=0.14.0" }, +] + [[package]] name = "sharkadm" version = "3.2.0"