Merge pull request #146 from ds-wizard/release/4.0.0

Release 4.0.0 (develop)
ds-wizard · Nov 13, 2023 · 42e5f66 · 42e5f66
2 parents 36363a0 + 997ab8d
commit 42e5f66
Show file tree

Hide file tree

Showing 23 changed files with 89 additions and 28 deletions.
diff --git a/packages/dsw-command-queue/CHANGELOG.md b/packages/dsw-command-queue/CHANGELOG.md
@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.0.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.28.0]
 
 Released for version consistency with other DSW tools.
@@ -147,3 +151,4 @@ Released for version consistency with other DSW tools.
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-command-queue/pyproject.toml b/packages/dsw-command-queue/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-command-queue'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Library for working with command queue and persistent commands'
 readme = 'README.md'
 keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
@@ -25,7 +25,7 @@ classifiers = [
 requires-python = '>=3.10, <4'
 dependencies = [
     # DSW
-    "dsw-database==3.28.0",
+    "dsw-database==4.0.0rc2",
 ]
 
 [project.urls]

diff --git a/packages/dsw-config/CHANGELOG.md b/packages/dsw-config/CHANGELOG.md
@@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.0.0]
+
+### Changed
+
+- Adapt DB renames in documents table
+
 ## [3.28.0]
 
 Released for version consistency with other DSW tools.
@@ -155,3 +161,4 @@ Released for version consistency with other DSW tools.
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-config/pyproject.toml b/packages/dsw-config/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-config'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Library for DSW config manipulation'
 readme = 'README.md'
 keywords = ['dsw', 'config', 'yaml', 'parser']

diff --git a/packages/dsw-data-seeder/CHANGELOG.md b/packages/dsw-data-seeder/CHANGELOG.md
@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.0.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.28.0]
 
 ### Changed
@@ -197,3 +201,4 @@ Released for version consistency with other DSW tools.
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py
@@ -6,4 +6,4 @@
 DEFAULT_PLACEHOLDER = '<<|TENANT-ID|>>'
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 PROG_NAME = 'dsw-data-seeder'
-VERSION = '3.28.0'
+VERSION = '4.0.0'
diff --git a/packages/dsw-data-seeder/pyproject.toml b/packages/dsw-data-seeder/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-data-seeder'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Worker for seeding DSW data'
 readme = 'README.md'
 keywords = ['data', 'database', 'seed', 'storage']
@@ -29,10 +29,10 @@ dependencies = [
     'sentry-sdk',
     'tenacity',
     # DSW
-    "dsw-command-queue==3.28.0",
-    "dsw-config==3.28.0",
-    "dsw-database==3.28.0",
-    "dsw-storage==3.28.0",
+    "dsw-command-queue==4.0.0rc2",
+    "dsw-config==4.0.0rc2",
+    "dsw-database==4.0.0rc2",
+    "dsw-storage==4.0.0rc2",
 ]
 
 [project.urls]

diff --git a/packages/dsw-database/CHANGELOG.md b/packages/dsw-database/CHANGELOG.md
@@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.0.0]
+
+### Changed
+
+- Adapt DB renames in documents table
+
 ## [3.28.0]
 
 Released for version consistency with other DSW tools.
@@ -162,3 +168,4 @@ Released for version consistency with other DSW tools.
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-database/pyproject.toml b/packages/dsw-database/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-database'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -26,7 +26,7 @@ dependencies = [
     'psycopg[binary]',
     'tenacity',
     # DSW
-    "dsw-config==3.28.0",
+    "dsw-config==4.0.0rc2",
 ]
 
 [project.urls]

diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md
@@ -8,16 +8,22 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.0.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.28.0]
 
 ### Added
 
 - Send charset as part of S3 object content-type
+
 ## [3.27.1]
 
 ### Fixed
 
 - Fix PDF output format detection
+
 ## [3.27.0]
 
 Released for version consistency with other DSW tools.
@@ -188,3 +194,4 @@ Released for version consistency with other DSW tools.
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py
@@ -6,7 +6,7 @@
 EXIT_SUCCESS = 0
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 PROG_NAME = 'docworker'
-VERSION = '3.28.0'
+VERSION = '4.0.0'
 
 
 class DocumentState:

diff --git a/packages/dsw-document-worker/pyproject.toml b/packages/dsw-document-worker/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-document-worker'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Worker for assembling and transforming documents'
 readme = 'README.md'
 keywords = ['documents', 'generation', 'jinja2', 'pandoc', 'worker']
@@ -40,10 +40,10 @@ dependencies = [
     'weasyprint',
     'XlsxWriter',
     # DSW
-    "dsw-command-queue==3.28.0",
-    "dsw-config==3.28.0",
-    "dsw-database==3.28.0",
-    "dsw-storage==3.28.0",
+    "dsw-command-queue==4.0.0rc2",
+    "dsw-config==4.0.0rc2",
+    "dsw-database==4.0.0rc2",
+    "dsw-storage==4.0.0rc2",
 ]
 
 [project.urls]

diff --git a/packages/dsw-mailer/CHANGELOG.md b/packages/dsw-mailer/CHANGELOG.md
@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.0.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.28.0]
 
 Released for version consistency with other DSW tools.
@@ -172,3 +176,4 @@ Released for version consistency with other DSW tools.
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py
@@ -5,4 +5,4 @@
 DEFAULT_ENCODING = 'utf-8'
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 PROG_NAME = 'dsw-mailer'
-VERSION = '3.28.0'
+VERSION = '4.0.0'
diff --git a/packages/dsw-mailer/pyproject.toml b/packages/dsw-mailer/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-mailer'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Worker for sending email notifications'
 readme = 'README.md'
 keywords = ['email', 'jinja2', 'notification', 'template']
@@ -31,9 +31,9 @@ dependencies = [
     'sentry-sdk',
     'tenacity',
     # DSW
-    "dsw-command-queue==3.28.0",
-    "dsw-config==3.28.0",
-    "dsw-database==3.28.0",
+    "dsw-command-queue==4.0.0rc2",
+    "dsw-config==4.0.0rc2",
+    "dsw-database==4.0.0rc2",
 ]
 
 [project.urls]

diff --git a/packages/dsw-models/CHANGELOG.md b/packages/dsw-models/CHANGELOG.md
@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.0.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.28.0]
 
 Released for version consistency with other DSW tools.
@@ -80,3 +84,4 @@ Released for version consistency with other DSW tools.
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-models/pyproject.toml b/packages/dsw-models/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-models'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Library with DSW models and basic IO operations'
 readme = 'README.md'
 keywords = ['dsw', 'config', 'yaml', 'parser']

diff --git a/packages/dsw-storage/CHANGELOG.md b/packages/dsw-storage/CHANGELOG.md
@@ -8,11 +8,19 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.0.0]
+
+### Fixed
+
+- Fixed creating template with special symbols
+- Fixed watch mode termination
+
 ## [3.28.0]
 
 ### Added
 
 - Support for object metadata
+
 ## [3.27.1]
 
 Released for version consistency with other DSW tools.
@@ -143,3 +151,4 @@ Released for version consistency with other DSW tools.
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-storage/pyproject.toml b/packages/dsw-storage/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-storage'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Library for managing DSW S3 storage'
 readme = 'README.md'
 keywords = ['dsw', 's3', 'bucket', 'storage']
@@ -26,7 +26,7 @@ dependencies = [
     'minio',
     'tenacity',
     # DSW
-    "dsw-config==3.28.0",
+    "dsw-config==4.0.0rc2",
 ]
 
 [project.urls]

diff --git a/packages/dsw-tdk/CHANGELOG.md b/packages/dsw-tdk/CHANGELOG.md
@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [4.0.0]
+
+### Fixed
+
+- Fixed `unpackage` with default output directory
+- Fixed terminating watch mode
+- Fixed non-printable characters handling
+
 ## [3.28.0]
 
 Released for version consistency with other DSW tools.
@@ -357,3 +365,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
 [3.27.0]: /../../tree/v3.27.0
 [3.27.1]: /../../tree/v3.27.1
 [3.28.0]: /../../tree/v3.28.0
+[4.0.0]: /../../tree/v4.0.0
diff --git a/packages/dsw-tdk/dsw/tdk/cli.py b/packages/dsw-tdk/dsw/tdk/cli.py
@@ -434,10 +434,12 @@ def extract_package(ctx, template_package, output, force: bool):
         data = pathlib.Path(template_package).read_bytes()
         tdk.extract_package(
             zip_data=data,
-            template_dir=pathlib.Path(output),
+            template_dir=pathlib.Path(output) if output is not None else output,
             force=force,
         )
     except Exception as e:
+        import traceback
+        traceback.print_exc()
         ClickPrinter.failure('Failed to extract the package')
         ClickPrinter.error(f'> {e}')
         exit(1)

diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py
@@ -3,7 +3,7 @@
 import re
 
 APP = 'dsw-tdk'
-VERSION = '3.28.0'
+VERSION = '4.0.0'
 METAMODEL_VERSION = 11
 
 REGEX_SEMVER = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$')

diff --git a/packages/dsw-tdk/pyproject.toml b/packages/dsw-tdk/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-tdk'
-version = "3.28.0"
+version = "4.0.0rc2"
 description = 'Data Stewardship Wizard Template Development Toolkit'
 readme = 'README.md'
 keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']