dapla-toolbelt-metadata 0.2.0__tar.gz → 0.2.1__tar.gz

{dapla_toolbelt_metadata-0.2.0 → dapla_toolbelt_metadata-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dapla-toolbelt-metadata
-Version: 0.2.0
+Version: 0.2.1
 Summary: Dapla Toolbelt Metadata
 Home-page: https://github.com/statisticsnorway/dapla-toolbelt-metadata
 License: MIT
@@ -15,7 +15,6 @@ 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: pandas (>=1.4.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 → dapla_toolbelt_metadata-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dapla-toolbelt-metadata"
-version = "0.2.0"
+version = "0.2.1"
 description = "Dapla Toolbelt Metadata"
 authors = ["Team Metadata <metadata@ssb.no>"]
 license = "MIT"
@@ -10,7 +10,7 @@ repository = "https://github.com/statisticsnorway/dapla-toolbelt-metadata"
 documentation = "https://statisticsnorway.github.io/dapla-toolbelt-metadata"
 classifiers = ["Development Status :: 4 - Beta"]
 
-packages = [{ include = "dapla_metadata", from = "src"}]
+packages = [{ include = "dapla_metadata", from = "src" }]
 
 [tool.poetry.urls]
 Changelog = "https://github.com/statisticsnorway/dapla-toolbelt-metadata/releases"
@@ -29,17 +29,17 @@ cloudpathlib = { extras = ["gs"], version = ">=0.17.0" }
 pyjwt = ">=2.8.0"
 ssb-klass-python = ">=0.0.9"
 ssb-datadoc-model = "^6.0.0"
-bs4 = "^0.0.2"
+typing-extensions = ">=4.12.2"
 
 [tool.poetry.group.dev.dependencies]
-black = "^24.8.0"
-pygments = "^2.18.0"
+black = ">=24.8.0"
+pygments = ">=2.18.0"
 coverage = { extras = ["toml"], version = ">=6.2" }
-faker = "^26.1.0"
-furo = "^2024.7.18"
-pre-commit = "^3.8.0"
-ruff = "^0.5.6"
-pytest = "^8.3.2"
+faker = ">=26.1.0"
+furo = ">=2024.7.18"
+pre-commit = ">=3.8.0"
+ruff = ">=0.5.6"
+pytest = ">=8.3.2"
 sphinx = ">=6.2.1"
 sphinx-autobuild = ">=2021.3.14"
 sphinx-autodoc-typehints = ">=1.24.0"
@@ -51,15 +51,16 @@ mypy = ">=0.950"
 pytest-cov = ">=3.0.0"
 nbstripout = ">=0.5.0"
 python-kacl = "*"
-pytest-mock = "^3.14.0"
+pytest-mock = ">=3.14.0"
 deptry = ">=0.12.0"
 pandas-stubs = "*"
 pyarrow-stubs = ">=10.0.1.9"
-requests-mock = "^1.12.1"
+requests-mock = ">=1.12.1"
 types-Pygments = "*"
 types-colorama = "*"
 types-setuptools = "*"
-types-beautifulsoup4 = "^4.12.0.20240511"
+types-beautifulsoup4 = ">=4.12.0.20240511"
+ipykernel = "^6.29.5"
 
 [tool.pytest.ini_options]
 pythonpath = ["src"]
@@ -72,10 +73,7 @@ tests = ["tests", "*/tests"]
 [tool.coverage.run]
 branch = true
 source = ["dapla_metadata"]
-omit = [
-    "tests/*",
-    "__init__.py",
-]
+omit = ["tests/*", "__init__.py"]
 relative_files = true
 
 [tool.coverage.report]
@@ -83,9 +81,7 @@ show_missing = true
 fail_under = 80
 
 [tool.mypy]
-plugins = [
-    "pydantic.mypy"
-]
+plugins = ["pydantic.mypy"]
 strict = false
 warn_unreachable = true
 pretty = true
@@ -117,10 +113,10 @@ disable_error_code = [
 ]
 
 [tool.ruff]
-force-exclude = true  # Apply excludes to pre-commit
+force-exclude = true # Apply excludes to pre-commit
 show-fixes = true
 src = ["src", "tests"]
-target-version = "py310"  # Minimum Python version supported
+target-version = "py310" # Minimum Python version supported
 include = ["*.py", "*.pyi", "**/pyproject.toml", "*.ipynb"]
 extend-exclude = [
     "__pycache__",
@@ -150,26 +146,31 @@ force-single-line = true
 max-complexity = 15
 
 [tool.ruff.lint.pydocstyle]
-convention = "google"  # You can also use "numpy".
+convention = "google" # You can also use "numpy".
 
 [tool.ruff.lint.pep8-naming]
-classmethod-decorators = ["classmethod", "validator", "root_validator", "pydantic.validator"]
+classmethod-decorators = [
+    "classmethod",
+    "validator",
+    "root_validator",
+    "pydantic.validator",
+]
 
 [tool.ruff.lint.per-file-ignores]
 "*/__init__.py" = ["F401"]
 "**/tests/*" = [
-    "ANN001",  # type annotations don't add value for test functions
-    "ANN002",  # type annotations don't add value for test functions
-    "ANN003",  # type annotations don't add value for test functions
-    "ANN201",  # type annotations don't add value for test functions
-    "ANN204",  # type annotations don't add value for test functions
-    "ANN205",  # type annotations don't add value for test functions
-    "ANN206",  # type annotations don't add value for test functions
-    "D100",    # docstrings are overkill for test functions
+    "ANN001", # type annotations don't add value for test functions
+    "ANN002", # type annotations don't add value for test functions
+    "ANN003", # type annotations don't add value for test functions
+    "ANN201", # type annotations don't add value for test functions
+    "ANN204", # type annotations don't add value for test functions
+    "ANN205", # type annotations don't add value for test functions
+    "ANN206", # type annotations don't add value for test functions
+    "D100",   # docstrings are overkill for test functions
     "D101",
     "D102",
     "D103",
-    "S101",    # asserts are encouraged in pytest
+    "S101",   # asserts are encouraged in pytest
 ]
 
 [build-system]

{dapla_toolbelt_metadata-0.2.0 → dapla_toolbelt_metadata-0.2.1}/src/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_toolbelt_metadata-0.2.0 → dapla_toolbelt_metadata-0.2.1}/src/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_toolbelt_metadata-0.2.0 → dapla_toolbelt_metadata-0.2.1}/src/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(