Merge pull request #23 from ds-wizard/release/3.16.0

Release 3.16.0 (develop)
ds-wizard · Oct 4, 2022 · d46ea41 · d46ea41
2 parents 7914fa4 + 04b3449
commit d46ea41
Show file tree

Hide file tree

Showing 21 changed files with 89 additions and 27 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.16.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.3]
 
 Released for version consistency with other DSW tools.
@@ -42,3 +46,4 @@ Released for version consistency with other DSW tools.
 [3.15.1]: /../../tree/v3.15.1
 [3.15.2]: /../../tree/v3.15.2
 [3.15.3]: /../../tree/v3.15.3
+[3.16.0]: /../../tree/v3.16.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.15.3'
+version = '3.16.0'
 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.3',
+ 'dsw-database==3.16.0',
 ]
 
 [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.16.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.3]
 
 Released for version consistency with other DSW tools.
@@ -42,3 +46,4 @@ Released for version consistency with other DSW tools.
 [3.15.1]: /../../tree/v3.15.1
 [3.15.2]: /../../tree/v3.15.2
 [3.15.3]: /../../tree/v3.15.3
+[3.16.0]: /../../tree/v3.16.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.15.3'
+version = '3.16.0'
 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.16.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.3]
 
 ### Fixed
@@ -83,3 +87,4 @@ Released for version consistency with other DSW tools.
 [3.15.1]: /../../tree/v3.15.1
 [3.15.2]: /../../tree/v3.15.2
 [3.15.3]: /../../tree/v3.15.3
+[3.16.0]: /../../tree/v3.16.0
diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py
@@ -1,5 +1,5 @@
 PROG_NAME = 'dsw-seeder'
-VERSION = '3.15.3'
+VERSION = '3.16.0'
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 
 LOGGER_NAME = 'DSW_DATA_SEEDER'

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.3'
+version = '3.16.0'
 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.3',
- 'dsw-config==3.15.3',
- 'dsw-database==3.15.3',
- 'dsw-storage==3.15.3',
+ 'dsw-command-queue==3.16.0',
+ 'dsw-config==3.16.0',
+ 'dsw-database==3.16.0',
+ 'dsw-storage==3.16.0',
 ]
 
 [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.16.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.3]
 
 ### Fixed
@@ -44,3 +48,4 @@ Released for version consistency with other DSW tools.
 [3.15.1]: /../../tree/v3.15.1
 [3.15.2]: /../../tree/v3.15.2
 [3.15.3]: /../../tree/v3.15.3
+[3.16.0]: /../../tree/v3.16.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.15.3'
+version = '3.16.0'
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -28,7 +28,7 @@ dependencies = [
  'psycopg2',
  'tenacity',
  # DSW
- 'dsw-config==3.15.3',
+ 'dsw-config==3.16.0',
 ]
 
 [project.urls]

diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md
@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [3.16.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.3]
 
 ### Fixed
@@ -51,3 +55,4 @@ Released for version consistency with other DSW tools.
 [3.15.1]: /../../tree/v3.15.1
 [3.15.2]: /../../tree/v3.15.2
 [3.15.3]: /../../tree/v3.15.3
+[3.16.0]: /../../tree/v3.16.0
diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py
@@ -1,6 +1,6 @@
 DEFAULT_ENCODING = 'utf-8'
 EXIT_SUCCESS = 0
-VERSION = '3.15.3'
+VERSION = '3.16.0'
 PROG_NAME = 'docworker'
 LOGGER_NAME = 'docworker'
 CURRENT_METAMODEL = 10

diff --git a/packages/dsw-document-worker/dsw/document_worker/model/context.py b/packages/dsw-document-worker/dsw/document_worker/model/context.py
@@ -108,6 +108,25 @@ def __init__(self, uuid, name, logo, integration_id, item_url, props, rq_body,
  self.rs_item_id = rs_item_id # type: str
  self.rs_item_template = rs_item_template # type: str
 
+ @staticmethod
+ def default():
+ return ApiIntegration(
+ uuid=NULL_UUID,
+ name='',
+ logo='',
+ integration_id='',
+ item_url='',
+ props={},
+ rq_body='',
+ rq_method='GET',
+ rq_url='',
+ rq_headers={},
+ rs_list_field='',
+ rs_item_id='',
+ rs_item_template='',
+ annotations={},
+ )
+
  @staticmethod
  def load(data: dict, **options):
  return ApiIntegration(
@@ -836,7 +855,10 @@ def __init__(self, uuid, title, text, tag_uuids, reference_uuids, props,
 
  def _resolve_links(self, ctx):
  super()._resolve_links_parent(ctx)
- self.integration = ctx.e.integrations[self.integration_uuid]
+ self.integration = ctx.e.integrations.get(
+ self.integration_uuid,
+ ApiIntegration.default(),
+ )
 
  @staticmethod
  def load(data: dict, **options):

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.3'
+version = '3.16.0'
 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.3',
- 'dsw-config==3.15.3',
- 'dsw-database==3.15.3',
- 'dsw-storage==3.15.3',
+ 'dsw-command-queue==3.16.0',
+ 'dsw-config==3.16.0',
+ 'dsw-database==3.16.0',
+ 'dsw-storage==3.16.0',
 ]
 
 [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.16.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.3]
 
 ### Fixed
@@ -49,3 +53,4 @@ Released for version consistency with other DSW tools.
 [3.15.1]: /../../tree/v3.15.1
 [3.15.2]: /../../tree/v3.15.2
 [3.15.3]: /../../tree/v3.15.3
+[3.16.0]: /../../tree/v3.16.0
diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py
@@ -1,5 +1,5 @@
 PROG_NAME = 'dsw-mailer'
-VERSION = '3.15.3'
+VERSION = '3.16.0'
 
 LOGGER_NAME = 'mailer'
 

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.3'
+version = '3.16.0'
 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.3',
- 'dsw-config==3.15.3',
- 'dsw-database==3.15.3',
+ 'dsw-command-queue==3.16.0',
+ 'dsw-config==3.16.0',
+ 'dsw-database==3.16.0',
 ]
 
 [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.16.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.3]
 
 Released for version consistency with other DSW tools.
@@ -42,3 +46,4 @@ Released for version consistency with other DSW tools.
 [3.15.1]: /../../tree/v3.15.1
 [3.15.2]: /../../tree/v3.15.2
 [3.15.3]: /../../tree/v3.15.3
+[3.16.0]: /../../tree/v3.16.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.15.3'
+version = '3.16.0'
 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.3',
+ 'dsw-config==3.16.0',
 ]
 
 [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.16.0]
+
+Released for version consistency with other DSW tools.
+
 ## [3.15.3]
 
 Released for version consistency with other DSW tools.
@@ -228,3 +232,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
 [3.15.1]: /../../tree/v3.15.1
 [3.15.2]: /../../tree/v3.15.2
 [3.15.3]: /../../tree/v3.15.3
+[3.16.0]: /../../tree/v3.16.0
diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py
@@ -2,7 +2,7 @@
 import re
 
 APP = 'dsw-tdk'
-VERSION = '3.15.3'
+VERSION = '3.16.0'
 METAMODEL_VERSION = 10
 
 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.15.3'
+version = '3.16.0'
 description = 'Data Stewardship Wizard Template Development Toolkit'
 readme = 'README.md'
 keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']