dsw-tdk 4.2.1__py2.py3-none-any.whl → 4.3.0__py2.py3-none-any.whl

dsw/tdk/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.2.1~36f77cc',
-    built_at='2024-01-08 13:03:48Z',
-    sha='36f77cc7870b4a1f631d2efc5d32a453d8a1b2ee',
+    version='v4.3.0~4d1ca3f',
+    built_at='2024-02-06 04:49:54Z',
+    sha='4d1ca3fde2601aaaeb733072bdcc0f752307e19d',
     branch='HEAD',
-    tag='v4.2.1',
+    tag='v4.3.0',
 )

dsw/tdk/cli.py

@@ -438,8 +438,6 @@ def extract_package(ctx, template_package, output, force: bool):
             force=force,
         )
     except Exception as e:
-        import traceback
-        traceback.print_exc()
         ClickPrinter.failure('Failed to extract the package')
         ClickPrinter.error(f'> {e}')
         exit(1)

dsw/tdk/consts.py

@@ -3,8 +3,8 @@ import pathspec  # type: ignore
 import re
 
 APP = 'dsw-tdk'
-VERSION = '4.2.1'
-METAMODEL_VERSION = 12
+VERSION = '4.3.0'
+METAMODEL_VERSION = 13
 
 REGEX_SEMVER = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$')
 REGEX_ORGANIZATION_ID = re.compile(r'^(?![.])(?!.*[.]$)[a-zA-Z0-9.]+$')

dsw/tdk/core.py

@@ -23,6 +23,10 @@ from .validation import ValidationError, TemplateValidator
 ChangeItem = Tuple[watchfiles.Change, pathlib.Path]
 
 
+def _change(item: ChangeItem, root: pathlib.Path) -> str:
+    return f'{item[0].name.upper()}[{item[1].relative_to(root).as_posix()}]'
+
+
 class TDKProcessingError(RuntimeError):
 
     def __init__(self, message: str, hint: str):
@@ -43,6 +47,7 @@ METAMODEL_VERSION_SUPPORT = {
     10: (3, 12, 0),
     11: (3, 20, 0),
     12: (4, 1, 0),
+    13: (4, 3, 0),
 }
 
 
@@ -267,7 +272,7 @@ class TDKCore:
             if project_update and result is not None:
                 self.safe_project.update_template_file(result)
         except Exception as e:
-            self.logger.error(f'Failed to store remote {tfile.remote_type.value} {tfile.filename.as_posix()}: {e}')
+            self.logger.error(f'Failed to store remote {tfile.remote_type.value} {tfile.filename.as_posix()}: {str(e)}')
 
     async def store_remote_files(self):
         for tfile in self.safe_project.safe_template.files.values():
@@ -471,7 +476,7 @@ class ChangesProcessor:
         deleted = set()
         updated = set()
         for file_change in self.file_changes:
-            self.tdk.logger.debug(f'Processing {file_change}')
+            self.tdk.logger.debug(f'Processing: {_change(file_change, self.tdk.safe_project.template_dir)}')
             change_type = file_change[0]
             filepath = file_change[1]
             if change_type == watchfiles.Change.deleted and filepath not in deleted:
@@ -514,6 +519,7 @@ class ChangesProcessor:
         if self.readme_change is not None or self.descriptor_change is not None:
             self.tdk.logger.debug('Updating template descriptor (metadata)')
             await self.tdk._update_descriptor()
+            self.tdk.safe_project.template = self.tdk.safe_template
 
     async def process_changes(self, changes: List[ChangeItem], force: bool):
         self._split_changes(changes)

{dsw_tdk-4.2.1.dist-info → dsw_tdk-4.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-tdk
-Version: 4.2.1
+Version: 4.3.0
 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.2.1.dist-info → dsw_tdk-4.3.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 dsw/tdk/__init__.py,sha256=zJeTybb0SqiNdGLkANjRa36hku4axi17mZL2dM3tHto,288
 dsw/tdk/__main__.py,sha256=IkqeOatxravhcQCdk4l0BkbaMILkgVopB9phYCIR1uo,38
 dsw/tdk/api_client.py,sha256=N3-PoO__kPtqFmR2QY-OG-9OkjYZwuXg8JxcBgpI8vQ,14222
-dsw/tdk/build_info.py,sha256=mN4_ERH9OYQqXoej66O6YhqhbGY5W9YhJ-T1k444k20,379
-dsw/tdk/cli.py,sha256=v5TY0ctiOxw8T37pvhY3qPSdC6YqArsWwn88dfcj5yg,21731
-dsw/tdk/consts.py,sha256=vCHXiGP7ptMzwFhG5W5PBNjna-f6a3_jTFU_mVOFkUw,634
-dsw/tdk/core.py,sha256=Dp7zSUDzAdU05IxZ5OHUQchemWbmHRZo1VR6PwqRt5g,25655
+dsw/tdk/build_info.py,sha256=EABvAnYQrkswIR2UF4ThXhq3CSTDWxUh1oxzOjzdu5s,379
+dsw/tdk/cli.py,sha256=_DZRSAo04wajiWVTod6lPdh477Rdxf7zBomySPxiL1c,21676
+dsw/tdk/consts.py,sha256=l8rvGnM19KGLallukR4TKOl1LbNBFKLQYkJCiT5unls,634
+dsw/tdk/core.py,sha256=H-s96wweQQnfFM7TmQnqYpvHRWUgK_xXzsxsy06lnA0,25930
 dsw/tdk/model.py,sha256=B9_cCmg_Z2IHabMMychKFV4dh4SFPVEentuPcb5fzlY,17235
 dsw/tdk/utils.py,sha256=gW_-1qj7osHgKhTjjMGeVL2pxoBDQuq7VjRE6OmEMCw,5734
 dsw/tdk/validation.py,sha256=hr04MRVqwBIBeKoX6v53Ix1S-vjvIQYM5dwI0SnMRsc,7827
@@ -12,9 +12,9 @@ dsw/tdk/templates/LICENSE.j2,sha256=6WzK06169rxZ4V_boYgejcZkw-1Up_WoU18iI3Gbkfs,
 dsw/tdk/templates/README.md.j2,sha256=FzUABeMM8To0oT48Kytoox64uAZ8F7FSAAXgpyKzqdU,247
 dsw/tdk/templates/env.j2,sha256=7IJ6HAIY1bXKLake4c72DSEUcQtAquO5wlSgH8vg_8s,97
 dsw/tdk/templates/starter.j2,sha256=XjZy3T9i8aWFlq4clXL6Q4JNh455crGelR9AoHisTbw,296
-dsw_tdk-4.2.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dsw_tdk-4.2.1.dist-info/METADATA,sha256=MJ5D-tgXw-a1MzraLFHPC64gL06eLA_skc_YPaFOUzk,6020
-dsw_tdk-4.2.1.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-dsw_tdk-4.2.1.dist-info/entry_points.txt,sha256=lwD5ZzRCbTFSjP1-SkhYsaJe8sEXOWWgMAMUhw0v2Hk,41
-dsw_tdk-4.2.1.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
-dsw_tdk-4.2.1.dist-info/RECORD,,
+dsw_tdk-4.3.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dsw_tdk-4.3.0.dist-info/METADATA,sha256=DErRPAY4KntoH_hG9IG5ysBAnQIl1foe42IGylhXXFQ,6020
+dsw_tdk-4.3.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+dsw_tdk-4.3.0.dist-info/entry_points.txt,sha256=lwD5ZzRCbTFSjP1-SkhYsaJe8sEXOWWgMAMUhw0v2Hk,41
+dsw_tdk-4.3.0.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
+dsw_tdk-4.3.0.dist-info/RECORD,,