Merge pull request #237 from ds-wizard/hotfix/4.10.6

Hotfix 4.10.6
ds-wizard · Sep 16, 2024 · d3420d2 · d3420d2
2 parents 64d4535 + a5183fe
commit d3420d2
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 33 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.10.6]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.5]
 
 ### Fixed
@@ -263,3 +267,4 @@ Released for version consistency with other DSW tools.
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
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 = "4.10.5"
+version = "4.10.6"
 description = 'Library for working with command queue and persistent commands'
 readme = 'README.md'
 keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
@@ -26,7 +26,7 @@ requires-python = '>=3.10, <4'
 dependencies = [
  'func-timeout',
  # DSW
- "dsw-database==4.10.5",
+ "dsw-database==4.10.6",
 ]
 
 [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]
 
 
+## [4.10.6]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.5]
 
 Released for version consistency with other DSW tools.
@@ -273,3 +277,4 @@ Released for version consistency with other DSW tools.
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
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 = "4.10.5"
+version = "4.10.6"
 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,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.10.6]
+
+### Fixed
+
+- Fixed database configuration
+
 ## [4.10.5]
 
 ### Fixed
@@ -321,3 +327,4 @@ Released for version consistency with other DSW tools.
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
diff --git a/packages/dsw-data-seeder/dsw/data_seeder/config.py b/packages/dsw-data-seeder/dsw/data_seeder/config.py
@@ -78,7 +78,7 @@ def extra_dbs(self) -> dict[str, DatabaseConfig]:
  cast=cast_int,
  )
  ),
- queue_timout=0,
+ queue_timeout=0,
  )
 
  return result

diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py
@@ -6,7 +6,7 @@
 DEFAULT_PLACEHOLDER = '<<|TENANT-ID|>>'
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 PROG_NAME = 'dsw-data-seeder'
-VERSION = '4.10.5'
+VERSION = '4.10.6'
 
 VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
 VAR_WORKDIR_PATH = 'WORKDIR_PATH'

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 = "4.10.5"
+version = "4.10.6"
 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==4.10.5",
- "dsw-config==4.10.5",
- "dsw-database==4.10.5",
- "dsw-storage==4.10.5",
+ "dsw-command-queue==4.10.6",
+ "dsw-config==4.10.6",
+ "dsw-database==4.10.6",
+ "dsw-storage==4.10.6",
 ]
 
 [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]
 
 
+## [4.10.6]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.5]
 
 Released for version consistency with other DSW tools.
@@ -284,3 +288,4 @@ Released for version consistency with other DSW tools.
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
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 = "4.10.5"
+version = "4.10.6"
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -26,7 +26,7 @@ dependencies = [
  'psycopg[binary]',
  'tenacity',
  # DSW
- "dsw-config==4.10.5",
+ "dsw-config==4.10.6",
 ]
 
 [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]
 
 
+## [4.10.6]
+
+### Fixed
+
+- Fixed inconsistencies in document context with metamodel version 14
+
 ## [4.10.5]
 
 ### Fixed
@@ -343,3 +349,4 @@ Released for version consistency with other DSW tools.
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
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 = '4.10.5'
+VERSION = '4.10.6'
 
 VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
 VAR_WORKDIR_PATH = 'WORKDIR_PATH'

diff --git a/packages/dsw-document-worker/dsw/document_worker/model/context.py b/packages/dsw-document-worker/dsw/document_worker/model/context.py
@@ -123,7 +123,7 @@ def __init__(self, uuid, name, logo, integration_id, item_url, props,
  self.id = integration_id # type: str
  self.item_url = item_url # type: Optional[str]
  self.logo = logo # type: Optional[str]
- self.props = props # type: dict[str, str]
+ self.props = props # type: list[str]
  self.type = integration_type # type: str
  self.annotations = annotations # type: AnnotationsT
 
@@ -173,7 +173,7 @@ def default():
  logo='',
  integration_id='',
  item_url='',
- props={},
+ props=[],
  rq_body='',
  rq_method='GET',
  rq_url='',
@@ -1588,7 +1588,7 @@ def __init__(self, uuid, first_name, last_name, gravatar_hash,
  image_url, membership_type):
  self.uuid = uuid # type: str
  self.first_name = first_name # type: str
- self.lastName = last_name # type: str
+ self.last_name = last_name # type: str
  self.gravatar_hash = gravatar_hash # type: str
  self.image_url = image_url # type: Optional[str]
  self.membership_type = membership_type # type: str
@@ -1662,8 +1662,8 @@ def is_owner(self):
 
  @staticmethod
  def load(data: dict, **options):
- return DocumentContextUserPermission(
- user=UserGroup.load(data['group'], **options),
+ return DocumentContextUserGroupPermission(
+ group=UserGroup.load(data['group'], **options),
  permissions=data['perms'],
  )
 

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 = "4.10.5"
+version = "4.10.6"
 description = 'Worker for assembling and transforming documents'
 readme = 'README.md'
 keywords = ['documents', 'generation', 'jinja2', 'pandoc', 'worker']
@@ -38,10 +38,10 @@ dependencies = [
  'weasyprint',
  'XlsxWriter',
  # DSW
- "dsw-command-queue==4.10.5",
- "dsw-config==4.10.5",
- "dsw-database==4.10.5",
- "dsw-storage==4.10.5",
+ "dsw-command-queue==4.10.6",
+ "dsw-config==4.10.6",
+ "dsw-database==4.10.6",
+ "dsw-storage==4.10.6",
 ]
 
 [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.10.6]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.5]
 
 ### Fixed
@@ -299,3 +303,4 @@ Released for version consistency with other DSW tools.
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py
@@ -5,7 +5,7 @@
 DEFAULT_ENCODING = 'utf-8'
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 PROG_NAME = 'dsw-mailer'
-VERSION = '4.10.5'
+VERSION = '4.10.6'
 
 VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
 VAR_WORKDIR_PATH = 'WORKDIR_PATH'
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 = "4.10.5"
+version = "4.10.6"
 description = 'Worker for sending email notifications'
 readme = 'README.md'
 keywords = ['email', 'jinja2', 'notification', 'template']
@@ -33,9 +33,9 @@ dependencies = [
  'sentry-sdk',
  'tenacity',
  # DSW
- "dsw-command-queue==4.10.5",
- "dsw-config==4.10.5",
- "dsw-database==4.10.5",
+ "dsw-command-queue==4.10.6",
+ "dsw-config==4.10.6",
+ "dsw-database==4.10.6",
 ]
 
 [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.10.6]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.5]
 
 Released for version consistency with other DSW tools.
@@ -190,3 +194,4 @@ Released for version consistency with other DSW tools.
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
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 = "4.10.5"
+version = "4.10.6"
 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,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.10.6]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.5]
 
 Released for version consistency with other DSW tools.
@@ -257,3 +261,4 @@ Released for version consistency with other DSW tools.
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
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 = "4.10.5"
+version = "4.10.6"
 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==4.10.5",
+ "dsw-config==4.10.6",
 ]
 
 [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]
 
 
+## [4.10.6]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.5]
 
 Released for version consistency with other DSW tools.
@@ -485,3 +489,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
 [4.10.3]: /../../tree/v4.10.3
 [4.10.4]: /../../tree/v4.10.4
 [4.10.5]: /../../tree/v4.10.5
+[4.10.6]: /../../tree/v4.10.6
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 = '4.10.5'
+VERSION = '4.10.6'
 METAMODEL_VERSION = 14
 
 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 = "4.10.5"
+version = "4.10.6"
 description = 'Data Stewardship Wizard Template Development Toolkit'
 readme = 'README.md'
 keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']