dsw-tdk 4.22.0__tar.gz → 4.22.2__tar.gz

{dsw_tdk-4.22.0 → dsw_tdk-4.22.2}/CHANGELOG.md

@@ -8,6 +8,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [4.22.2]
+
+Released for version consistency with other DSW tools.
+
+## [4.22.1]
+
+### Fixed
+
+- Fixed checking metamodel and API version in TDK
+
 ## [4.22.0]
 
 ### Added
@@ -600,3 +610,5 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
 [4.20.1]: /../../tree/v4.20.1
 [4.21.0]: /../../tree/v4.21.0
 [4.22.0]: /../../tree/v4.22.0
+[4.22.1]: /../../tree/v4.22.1
+[4.22.2]: /../../tree/v4.22.2

{dsw_tdk-4.22.0/dsw_tdk.egg-info → dsw_tdk-4.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-tdk
-Version: 4.22.0
+Version: 4.22.2
 Summary: Data Stewardship Wizard Template Development Toolkit
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0

{dsw_tdk-4.22.0 → dsw_tdk-4.22.2}/dsw/tdk/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.22.0~dffe6c1',
-    built_at='2025-09-02 13:01:04Z',
-    sha='dffe6c10e47b8795a0d27d495d1c0c0a5d4a76fb',
+    version='v4.22.2~ffb94ee',
+    built_at='2025-09-05 10:26:00Z',
+    sha='ffb94ee5b3b1a50e880c168bd22105e52b1a13ee',
     branch='HEAD',
-    tag='v4.22.0',
+    tag='v4.22.2',
 )

{dsw_tdk-4.22.0 → dsw_tdk-4.22.2}/dsw/tdk/cli.py

@@ -418,7 +418,7 @@ def put_template(ctx, template_dir, api_url, api_key, force, watch):
             )
             await tdk.store_remote(force=force)
             ClickPrinter.success(f'Template {tdk.safe_project.safe_template.id} '
-                                 f'uploaded to {api_url}')
+                                 f'uploaded to {CONFIG.env.api_url}')
 
             if watch:
                 ClickPrinter.watch('Entering watch mode... (press Ctrl+C to abort)')

{dsw_tdk-4.22.0 → dsw_tdk-4.22.2}/dsw/tdk/consts.py

@@ -4,7 +4,7 @@ import re
 import pathspec
 
 APP = 'dsw-tdk'
-VERSION = '4.22.0'
+VERSION = '4.22.2'
 METAMODEL_VERSION_MAJOR = 17
 METAMODEL_VERSION_MINOR = 0
 METAMODEL_VERSION = f'{METAMODEL_VERSION_MAJOR}.{METAMODEL_VERSION_MINOR}'

{dsw_tdk-4.22.0 → dsw_tdk-4.22.2}/dsw/tdk/core.py

@@ -53,9 +53,10 @@ METAMODEL_VERSION_SUPPORT = {
 }
 
 
-# pylint: disable=too-many-public-methods
+# pylint: disable-next=too-many-public-methods
 class TDKCore:
 
+    # pylint: disable-next=too-many-locals
     def _check_metamodel_version(self):
         hint = 'Fix your metamodelVersion in template.json and/or visit docs'
         mm_ver = str(self.safe_template.metamodel_version)
@@ -79,10 +80,16 @@ class TDKCore:
         vtag = f'v{ver[0]}.{ver[1]}.{ver[2]}'
         if mm_ver not in METAMODEL_VERSION_SUPPORT:
             raise TDKProcessingError(f'Unknown metamodel version: {mm_ver}', hint)
-        map_reverse = {f'v{v[0]}.{v[1]}.{v[2]}': k for k, v in METAMODEL_VERSION_SUPPORT.items()}
-        if vtag not in map_reverse:
+        map_reverse = {v: k for k, v in METAMODEL_VERSION_SUPPORT.items()}
+        nearest_leq = unknown_version = (0, 0, 0)
+        for known_version in map_reverse.keys():
+            if known_version <= ver:
+                nearest_leq = known_version
+            else:
+                break
+        if nearest_leq == unknown_version:
             raise TDKProcessingError(f'Unsupported API version: {vtag}', hint)
-        api_mm_major, api_mm_minor = map(int, map_reverse[vtag].split('.'))
+        api_mm_major, api_mm_minor = map(int, map_reverse[nearest_leq].split('.'))
         if mm_major != api_mm_major or mm_minor < api_mm_minor:
             raise TDKProcessingError(
                 f'Unsupported metamodel version {mm_ver} for API version {api_version}',

{dsw_tdk-4.22.0 → dsw_tdk-4.22.2/dsw_tdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-tdk
-Version: 4.22.0
+Version: 4.22.2
 Summary: Data Stewardship Wizard Template Development Toolkit
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0

{dsw_tdk-4.22.0 → dsw_tdk-4.22.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-tdk'
-version = "4.22.0"
+version = "4.22.2"
 description = 'Data Stewardship Wizard Template Development Toolkit'
 readme = 'README.md'
 keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']