dsw-tdk 4.2.1__tar.gz → 4.3.0__tar.gz

{dsw-tdk-4.2.1 → dsw-tdk-4.3.0}/CHANGELOG.md

@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [4.3.0]
+
+### Fixed
+
+- Fix `watch` mode errors after descriptor change
+
 ## [4.2.1]
 
 Released for version consistency with other DSW tools.
@@ -392,3 +398,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
 [4.1.1]: /../../tree/v4.1.1
 [4.2.0]: /../../tree/v4.2.0
 [4.2.1]: /../../tree/v4.2.1
+[4.3.0]: /../../tree/v4.3.0

{dsw-tdk-4.2.1/dsw_tdk.egg-info → dsw-tdk-4.3.0}/PKG-INFO

@@ -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 → dsw-tdk-4.3.0}/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-4.2.1 → dsw-tdk-4.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-4.2.1 → dsw-tdk-4.3.0}/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-4.2.1 → dsw-tdk-4.3.0}/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 → dsw-tdk-4.3.0/dsw_tdk.egg-info}/PKG-INFO

@@ -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 → dsw-tdk-4.3.0}/pyproject.toml

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