Merge pull request #14 from ds-wizard/hotfix/3.15.1

Hotfix 3.15.1
ds-wizard · Sep 7, 2022 · 2e9efdb · 2e9efdb
2 parents 8e4f2e8 + 47a5080
commit 2e9efdb
Show file tree

Hide file tree

Showing 18 changed files with 75 additions and 26 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]
 
 
+## [3.15.1]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.0]
 
 Released for version consistency with other DSW tools.
@@ -26,3 +30,5 @@ Released for version consistency with other DSW tools.
 [Unreleased]: /../../compare/main...develop
 [3.14.0]: /../../tree/v3.14.0
 [3.14.1]: /../../tree/v3.14.1
+[3.15.0]: /../../tree/v3.15.0
+[3.15.1]: /../../tree/v3.15.1
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.15.0'
+version = '3.15.1'
 description = 'Library for working with command queue and persistent commands'
 readme = 'README.md'
 keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
@@ -27,7 +27,7 @@ classifiers = [
 requires-python = '>=3.7, <4'
 dependencies = [
  # DSW
- 'dsw-database==3.15.0',
+ 'dsw-database==3.15.1',
 ]
 
 [project.urls]

diff --git a/packages/dsw-config/CHANGELOG.md b/packages/dsw-config/CHANGELOG.md
@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [3.15.1]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.0]
 
 Released for version consistency with other DSW tools.
@@ -26,3 +30,5 @@ Released for version consistency with other DSW tools.
 [Unreleased]: /../../compare/main...develop
 [3.14.0]: /../../tree/v3.14.0
 [3.14.1]: /../../tree/v3.14.1
+[3.15.0]: /../../tree/v3.15.0
+[3.15.1]: /../../tree/v3.15.1
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.15.0'
+version = '3.15.1'
 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]
 
 
+## [3.15.1]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.0]
 
 Released for version consistency with other DSW tools.
@@ -62,3 +66,5 @@ Released for version consistency with other DSW tools.
 [3.13.0]: https://github.com/ds-wizard/data-seeder/tree/v3.13.0
 [3.14.0]: /../../tree/v3.14.0
 [3.14.1]: /../../tree/v3.14.1
+[3.15.0]: /../../tree/v3.15.0
+[3.15.1]: /../../tree/v3.15.1
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.15.0'
+version = '3.15.1'
 description = 'Worker for seeding DSW data'
 readme = 'README.md'
 keywords = ['data', 'database', 'seed', 'storage']
@@ -27,10 +27,10 @@ dependencies = [
  'click',
  'tenacity',
  # DSW
- 'dsw-command-queue==3.15.0',
- 'dsw-config==3.15.0',
- 'dsw-database==3.15.0',
- 'dsw-storage==3.15.0',
+ 'dsw-command-queue==3.15.1',
+ 'dsw-config==3.15.1',
+ 'dsw-database==3.15.1',
+ 'dsw-storage==3.15.1',
 ]
 
 [project.urls]

diff --git a/packages/dsw-database/CHANGELOG.md b/packages/dsw-database/CHANGELOG.md
@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [3.15.1]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.0]
 
 Released for version consistency with other DSW tools.
@@ -27,3 +31,4 @@ Released for version consistency with other DSW tools.
 [3.14.0]: /../../tree/v3.14.0
 [3.14.1]: /../../tree/v3.14.1
 [3.15.0]: /../../tree/v3.15.0
+[3.15.1]: /../../tree/v3.15.1
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.15.0'
+version = '3.15.1'
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -28,7 +28,7 @@ dependencies = [
  'psycopg2',
  'tenacity',
  # DSW
- 'dsw-config==3.15.0',
+ 'dsw-config==3.15.1',
 ]
 
 [project.urls]

diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md
@@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [3.15.1]
+
+### Fixed
+
+- Handling document generation exceptions
+
 ## [3.15.0]
 
 ### Changed
@@ -29,3 +35,4 @@ Released for version consistency with other DSW tools.
 [3.14.0]: /../../tree/v3.14.0
 [3.14.1]: /../../tree/v3.14.1
 [3.15.0]: /../../tree/v3.15.0
+[3.15.1]: /../../tree/v3.15.1
diff --git a/packages/dsw-document-worker/dsw/document_worker/exceptions.py b/packages/dsw-document-worker/dsw/document_worker/exceptions.py
@@ -5,6 +5,9 @@ def __init__(self, job_id: str, msg: str, exc=None):
  self.msg = msg
  self.exc = exc
 
+ def __str__(self):
+ return self.msg
+
  def log_message(self):
  if self.exc is None:
  return self.msg

diff --git a/packages/dsw-document-worker/dsw/document_worker/templates/filters.py b/packages/dsw-document-worker/dsw/document_worker/templates/filters.py
@@ -170,10 +170,11 @@ def to_context_obj(ctx, **options) -> DocumentContext:
 class TemplateRenderingError(JobException):
 
  def __init__(self, title, message):
- self.message = f'{title}\n\n{message}'
-
- def __str__(self):
- return self.message
+ super().__init__(
+ job_id='',
+ msg=f'{title}\n\n{message}',
+ exc=None,
+ )
 
 
 def raise_error(message, title='Document rendering error'):

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.15.0'
+version = '3.15.1'
 description = 'Worker for assembling and transforming documents'
 readme = 'README.md'
 keywords = ['documents', 'generation', 'jinja2', 'pandoc', 'worker']
@@ -40,10 +40,10 @@ dependencies = [
  'sentry-sdk',
  'tenacity',
  # DSW
- 'dsw-command-queue==3.15.0',
- 'dsw-config==3.15.0',
- 'dsw-database==3.15.0',
- 'dsw-storage==3.15.0',
+ 'dsw-command-queue==3.15.1',
+ 'dsw-config==3.15.1',
+ 'dsw-database==3.15.1',
+ 'dsw-storage==3.15.1',
 ]
 
 [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]
 
 
+## [3.15.1]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.0]
 
 ### Changed
@@ -29,3 +33,4 @@ Released for version consistency with other DSW tools.
 [3.14.0]: /../../tree/v3.14.0
 [3.14.1]: /../../tree/v3.14.1
 [3.15.0]: /../../tree/v3.15.0
+[3.15.1]: /../../tree/v3.15.1
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.15.0'
+version = '3.15.1'
 description = 'Worker for sending email notifications'
 readme = 'README.md'
 keywords = ['email', 'jinja2', 'notification', 'template']
@@ -29,9 +29,9 @@ dependencies = [
  'sentry-sdk',
  'tenacity',
  # DSW
- 'dsw-command-queue==3.15.0',
- 'dsw-config==3.15.0',
- 'dsw-database==3.15.0',
+ 'dsw-command-queue==3.15.1',
+ 'dsw-config==3.15.1',
+ 'dsw-database==3.15.1',
 ]
 
 [project.urls]

diff --git a/packages/dsw-storage/CHANGELOG.md b/packages/dsw-storage/CHANGELOG.md
@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [3.15.1]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.0]
 
 Released for version consistency with other DSW tools.
@@ -27,3 +31,4 @@ Released for version consistency with other DSW tools.
 [3.14.0]: /../../tree/v3.14.0
 [3.14.1]: /../../tree/v3.14.1
 [3.15.0]: /../../tree/v3.15.0
+[3.15.1]: /../../tree/v3.15.1
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.15.0'
+version = '3.15.1'
 description = 'Library for managing DSW S3 storage'
 readme = 'README.md'
 keywords = ['dsw', 's3', 'bucket', 'storage']
@@ -28,7 +28,7 @@ dependencies = [
  'minio',
  'tenacity',
  # DSW
- 'dsw-config==3.15.0',
+ 'dsw-config==3.15.1',
 ]
 
 [project.urls]

diff --git a/packages/dsw-tdk/CHANGELOG.md b/packages/dsw-tdk/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [3.15.1]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.0]
 
 Released for version consistency with other DSW tools.
@@ -213,3 +217,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
 [3.14.0]: /../../tree/v3.14.0
 [3.14.1]: /../../tree/v3.14.1
 [3.15.0]: /../../tree/v3.15.0
+[3.15.1]: /../../tree/v3.15.1
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.15.0'
+version = '3.15.1'
 description = 'Data Stewardship Wizard Template Development Toolkit'
 readme = 'README.md'
 keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']