dapla-toolbelt-metadata 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

dapla_metadata/__init__.py

@@ -1,3 +1,5 @@
 """Tools and clients for working with the Dapla Metadata system."""
 
+import datadoc_model.model as datadoc_model
+
 from . import datasets

dapla_metadata/datasets/config.py

@@ -16,8 +16,6 @@ from dapla_metadata.datasets.utility.constants import (
 from dapla_metadata.datasets.utility.enums import DaplaRegion
 from dapla_metadata.datasets.utility.enums import DaplaService
 
-logging.basicConfig(level=logging.DEBUG, force=True)
-
 logger = logging.getLogger(__name__)
 
 DOT_ENV_FILE_PATH = Path(__file__).parent.joinpath(".env")

dapla_metadata/datasets/core.py

@@ -321,14 +321,17 @@ class Datadoc:
             variables=[],
         )
 
-        override_dataset_fields(merged_metadata, extracted_metadata)
+        override_dataset_fields(
+            merged_metadata=merged_metadata,
+            existing_metadata=existing_metadata,
+        )
 
         # Merge variables.
         # For each extracted variable, copy existing metadata into the merged metadata
         return merge_variables(
-            existing_metadata,
-            extracted_metadata,
-            merged_metadata,
+            existing_metadata=existing_metadata,
+            extracted_metadata=extracted_metadata,
+            merged_metadata=merged_metadata,
         )
 
     def _extract_metadata_from_existing_document(

{dapla_toolbelt_metadata-0.2.0.dist-info → dapla_toolbelt_metadata-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dapla-toolbelt-metadata
-Version: 0.2.0
+Version: 0.2.2
 Summary: Dapla Toolbelt Metadata
 Home-page: https://github.com/statisticsnorway/dapla-toolbelt-metadata
 License: MIT
@@ -15,9 +15,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: arrow (>=1.3.0)
 Requires-Dist: beautifulsoup4 (>=4.12.3)
-Requires-Dist: bs4 (>=0.0.2,<0.0.3)
 Requires-Dist: cloudpathlib[gs] (>=0.17.0)
-Requires-Dist: dapla-toolbelt (>=1.3.3)
+Requires-Dist: dapla-toolbelt (>=3.0.1)
 Requires-Dist: pandas (>=1.4.2)
 Requires-Dist: pyarrow (>=8.0.0)
 Requires-Dist: pydantic (>=2.5.2)
@@ -26,6 +25,7 @@ Requires-Dist: python-dotenv (>=1.0.1)
 Requires-Dist: requests (>=2.31.0)
 Requires-Dist: ssb-datadoc-model (>=6.0.0,<7.0.0)
 Requires-Dist: ssb-klass-python (>=0.0.9)
+Requires-Dist: typing-extensions (>=4.12.2)
 Project-URL: Changelog, https://github.com/statisticsnorway/dapla-toolbelt-metadata/releases
 Project-URL: Documentation, https://statisticsnorway.github.io/dapla-toolbelt-metadata
 Project-URL: Repository, https://github.com/statisticsnorway/dapla-toolbelt-metadata

{dapla_toolbelt_metadata-0.2.0.dist-info → dapla_toolbelt_metadata-0.2.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-dapla_metadata/__init__.py,sha256=i8bhabWldn-kGfbdCMANY-iC0LbacRIPU1-LEorXqVY,92
+dapla_metadata/__init__.py,sha256=sGQ4msqsvSa-f2fs-og8KRsD97TP_yKz1YT8q9od2HM,137
 dapla_metadata/datasets/__init__.py,sha256=TvzskpdFC6hGcC9_55URT5jr5wNAPzXuISd2UjJWM_8,280
 dapla_metadata/datasets/code_list.py,sha256=kp1O6sUiUAP9WKlWY8IgHWx_1IOzJA63WveHqolgKmg,9082
-dapla_metadata/datasets/config.py,sha256=lmujwsKKT_X94AL1zHiot24TOyynm92N5dhMti-dhYs,2215
-dapla_metadata/datasets/core.py,sha256=gUt-LDoQnT8-sFvSpodC6qg4ALgITWkSNOn4dVZuuCQ,21461
+dapla_metadata/datasets/config.py,sha256=0YrhmsCYRWU75bPr5Cb8qgU7HUvIMTEiMXiCoQ-REgQ,2161
+dapla_metadata/datasets/core.py,sha256=GVqK7zH94ch9fJvhf04L61nNBk48XpjdmAZrY6lvj6I,21582
 dapla_metadata/datasets/dapla_dataset_path_info.py,sha256=7wwVwykJUaRbqCZrAMsZsOd1p_xO8bHe5LhNOLE8j6k,21600
 dapla_metadata/datasets/dataset_parser.py,sha256=PhhGvkUrmQ2nypYgg4JWushb7gFvde65XbRhmXdPZUI,7965
 dapla_metadata/datasets/external_sources/__init__.py,sha256=qvIdXwqyEmXNUCB94ZtZXRzifdW4hiXASFFPtC70f6E,83
@@ -16,7 +16,7 @@ dapla_metadata/datasets/utility/__init__.py,sha256=pp6tUcgUbo8iq9OPtFKQrTbLuI3uY
 dapla_metadata/datasets/utility/constants.py,sha256=V9ixHTShK1uBcSesaVoKDSHzAh3CX1ATO-Z3wZHxAKs,2417
 dapla_metadata/datasets/utility/enums.py,sha256=C-qlB9ZI4Oy3q1ehbuF0GD7lqJJbuaspY_e8BDFu5DU,727
 dapla_metadata/datasets/utility/utils.py,sha256=wCRZBB3YwXTB_BaqDABaaeBjVmMZP8z3grjfTxX308k,18018
-dapla_toolbelt_metadata-0.2.0.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-dapla_toolbelt_metadata-0.2.0.dist-info/METADATA,sha256=UswEf8UvTCen439oh3m6j-HI8EC8CJpCqThyJis_4no,4927
-dapla_toolbelt_metadata-0.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dapla_toolbelt_metadata-0.2.0.dist-info/RECORD,,
+dapla_toolbelt_metadata-0.2.2.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+dapla_toolbelt_metadata-0.2.2.dist-info/METADATA,sha256=IGVR2c5XHK3VCDGLqzse7mG7VDuzTtzOuMolQtNVc1w,4935
+dapla_toolbelt_metadata-0.2.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dapla_toolbelt_metadata-0.2.2.dist-info/RECORD,,