diff --git a/packages/dsw-command-queue/CHANGELOG.md b/packages/dsw-command-queue/CHANGELOG.md index f4c19523..190ef5ce 100644 --- 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.4] + +Released for version consistency with other DSW tools. + ## [4.10.3] Released for version consistency with other DSW tools. @@ -251,3 +255,4 @@ Released for version consistency with other DSW tools. [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-command-queue/pyproject.toml b/packages/dsw-command-queue/pyproject.toml index 49e08fdd..148aa1ef 100644 --- 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.3" +version = "4.10.4" 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==4.10.3", + "dsw-database==4.10.4", ] [project.urls] diff --git a/packages/dsw-config/CHANGELOG.md b/packages/dsw-config/CHANGELOG.md index 6e4f3da1..5ec0acd4 100644 --- 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.4] + +Released for version consistency with other DSW tools. + ## [4.10.3] Released for version consistency with other DSW tools. @@ -263,3 +267,4 @@ Released for version consistency with other DSW tools. [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-config/pyproject.toml b/packages/dsw-config/pyproject.toml index a613b745..c9abe3c3 100644 --- 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.3" +version = "4.10.4" 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 index 4d5af92d..acf0d432 100644 --- 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.10.4] + +Released for version consistency with other DSW tools. + ## [4.10.3] ### Changed @@ -309,3 +313,4 @@ Released for version consistency with other DSW tools. [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py index 2b2608f5..98bad67b 100644 --- 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.3' +VERSION = '4.10.4' 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 index 6b906d2b..96f3ec56 100644 --- 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.3" +version = "4.10.4" 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.3", - "dsw-config==4.10.3", - "dsw-database==4.10.3", - "dsw-storage==4.10.3", + "dsw-command-queue==4.10.4", + "dsw-config==4.10.4", + "dsw-database==4.10.4", + "dsw-storage==4.10.4", ] [project.urls] diff --git a/packages/dsw-database/CHANGELOG.md b/packages/dsw-database/CHANGELOG.md index e06080aa..c86a9680 100644 --- 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.4] + +Released for version consistency with other DSW tools. + ## [4.10.3] Released for version consistency with other DSW tools. @@ -274,3 +278,4 @@ Released for version consistency with other DSW tools. [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-database/pyproject.toml b/packages/dsw-database/pyproject.toml index 4272e7f4..9ef7515f 100644 --- 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.3" +version = "4.10.4" 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.3", + "dsw-config==4.10.4", ] [project.urls] diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md index 3b2d2da6..47e63a78 100644 --- 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] +## [4.10.4] + +Released for version consistency with other DSW tools. + ## [4.10.3] ### Changed @@ -331,3 +335,4 @@ Released for version consistency with other DSW tools. [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py index 3a63ed3f..918ed8e6 100644 --- 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.3' +VERSION = '4.10.4' VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH' VAR_WORKDIR_PATH = 'WORKDIR_PATH' diff --git a/packages/dsw-document-worker/pyproject.toml b/packages/dsw-document-worker/pyproject.toml index f5d09764..05123f84 100644 --- 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.3" +version = "4.10.4" 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.3", - "dsw-config==4.10.3", - "dsw-database==4.10.3", - "dsw-storage==4.10.3", + "dsw-command-queue==4.10.4", + "dsw-config==4.10.4", + "dsw-database==4.10.4", + "dsw-storage==4.10.4", ] [project.urls] diff --git a/packages/dsw-mailer/CHANGELOG.md b/packages/dsw-mailer/CHANGELOG.md index b6425c38..ca91252b 100644 --- a/packages/dsw-mailer/CHANGELOG.md +++ b/packages/dsw-mailer/CHANGELOG.md @@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.10.4] + +### Fixed + +- Fix selection of SMTP security mechanism + ## [4.10.3] ### Changed @@ -285,3 +291,4 @@ Released for version consistency with other DSW tools. [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-mailer/dsw/mailer/config.py b/packages/dsw-mailer/dsw/mailer/config.py index 5136bd6c..d0575ce0 100644 --- a/packages/dsw-mailer/dsw/mailer/config.py +++ b/packages/dsw-mailer/dsw/mailer/config.py @@ -173,12 +173,20 @@ class SMTPSecurityMode(enum.Enum): SSL = enum.auto() TLS = enum.auto() + @classmethod + def has(cls, name): + return name in cls.__members__ + class MailProvider(enum.Enum): NONE = enum.auto() SMTP = enum.auto() AMAZON_SES = enum.auto() + @classmethod + def has(cls, name): + return name in cls.__members__ + class MailSMTPConfig: @@ -188,7 +196,7 @@ def __init__(self, host: str | None = None, port: int | None = None, auth_enabled: bool | None = None, timeout: int = 10): self.host = host self.security = SMTPSecurityMode.PLAIN # type: SMTPSecurityMode - if security is not None and security.upper() in SMTPSecurityMode: + if security is not None and SMTPSecurityMode.has(security.upper()): self.security = SMTPSecurityMode[security.upper()] elif ssl is not None: self.security = SMTPSecurityMode.SSL if ssl else SMTPSecurityMode.PLAIN diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py index 6ce57616..fb21a013 100644 --- 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.3' +VERSION = '4.10.4' 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 index bbbef36c..b59c78df 100644 --- 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.3" +version = "4.10.4" 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.3", - "dsw-config==4.10.3", - "dsw-database==4.10.3", + "dsw-command-queue==4.10.4", + "dsw-config==4.10.4", + "dsw-database==4.10.4", ] [project.urls] diff --git a/packages/dsw-models/CHANGELOG.md b/packages/dsw-models/CHANGELOG.md index 0926ed6d..105f5b13 100644 --- 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.4] + +Released for version consistency with other DSW tools. + ## [4.10.3] Released for version consistency with other DSW tools. @@ -180,3 +184,4 @@ Released for version consistency with other DSW tools. [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-models/pyproject.toml b/packages/dsw-models/pyproject.toml index 9c7fa441..f9296112 100644 --- 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.3" +version = "4.10.4" 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 index 95a820b1..e0844af6 100644 --- 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.4] + +Released for version consistency with other DSW tools. + ## [4.10.3] Released for version consistency with other DSW tools. @@ -247,3 +251,4 @@ Released for version consistency with other DSW tools. [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-storage/pyproject.toml b/packages/dsw-storage/pyproject.toml index 2c8c9a66..a4b7e9fd 100644 --- 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.3" +version = "4.10.4" 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.3", + "dsw-config==4.10.4", ] [project.urls] diff --git a/packages/dsw-tdk/CHANGELOG.md b/packages/dsw-tdk/CHANGELOG.md index a699830d..9d96559b 100644 --- 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.4] + +Released for version consistency with other DSW tools. + ## [4.10.3] ### Changed @@ -475,3 +479,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht [4.10.1]: /../../tree/v4.10.1 [4.10.2]: /../../tree/v4.10.2 [4.10.3]: /../../tree/v4.10.3 +[4.10.4]: /../../tree/v4.10.4 diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py index f67df9dc..04f871b2 100644 --- 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.3' +VERSION = '4.10.4' 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 index 49e8042e..89dec1cd 100644 --- 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.3" +version = "4.10.4" description = 'Data Stewardship Wizard Template Development Toolkit' readme = 'README.md' keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']