From d9d46eff9e341643f8e594f5e6d1347a3a91f840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Fri, 13 Sep 2024 11:10:39 +0200 Subject: [PATCH] Hotfix 4.9.5 --- packages/dsw-command-queue/CHANGELOG.md | 7 +++++++ packages/dsw-command-queue/pyproject.toml | 4 ++-- packages/dsw-config/CHANGELOG.md | 5 +++++ packages/dsw-config/pyproject.toml | 2 +- packages/dsw-data-seeder/CHANGELOG.md | 7 +++++++ packages/dsw-data-seeder/dsw/data_seeder/consts.py | 2 +- packages/dsw-data-seeder/pyproject.toml | 10 +++++----- packages/dsw-database/CHANGELOG.md | 5 +++++ packages/dsw-database/pyproject.toml | 4 ++-- packages/dsw-document-worker/CHANGELOG.md | 7 +++++++ .../dsw-document-worker/dsw/document_worker/consts.py | 2 +- packages/dsw-document-worker/pyproject.toml | 10 +++++----- packages/dsw-mailer/CHANGELOG.md | 7 +++++++ packages/dsw-mailer/dsw/mailer/consts.py | 2 +- packages/dsw-mailer/pyproject.toml | 8 ++++---- packages/dsw-models/CHANGELOG.md | 5 +++++ packages/dsw-models/pyproject.toml | 2 +- packages/dsw-storage/CHANGELOG.md | 5 +++++ packages/dsw-storage/pyproject.toml | 4 ++-- packages/dsw-tdk/CHANGELOG.md | 5 +++++ packages/dsw-tdk/dsw/tdk/consts.py | 2 +- packages/dsw-tdk/pyproject.toml | 2 +- 22 files changed, 80 insertions(+), 27 deletions(-) diff --git a/packages/dsw-command-queue/CHANGELOG.md b/packages/dsw-command-queue/CHANGELOG.md index c5f118fd..84d2bbcf 100644 --- a/packages/dsw-command-queue/CHANGELOG.md +++ b/packages/dsw-command-queue/CHANGELOG.md @@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.9.5] + +### Fixed + +- Fixed command queue job timeout (moved support from workers to queue, reliable timeout approach) + ## [4.9.4] Released for version consistency with other DSW tools. @@ -246,3 +252,4 @@ Released for version consistency with other DSW tools. [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-command-queue/pyproject.toml b/packages/dsw-command-queue/pyproject.toml index abeb934f..b4416cda 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.9.4" +version = "4.9.5" 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.9.4", + "dsw-database==4.9.5", ] [project.urls] diff --git a/packages/dsw-config/CHANGELOG.md b/packages/dsw-config/CHANGELOG.md index c938d92d..a8c1335a 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.9.5] + +Released for version consistency with other DSW tools. + ## [4.9.4] Released for version consistency with other DSW tools. @@ -258,3 +262,4 @@ Released for version consistency with other DSW tools. [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-config/pyproject.toml b/packages/dsw-config/pyproject.toml index 3707e623..25e295c2 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.9.4" +version = "4.9.5" 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 ecef0c34..b70e5bd4 100644 --- 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.9.5] + +### Fixed + +- Fixed command queue job timeout (moved support from workers to queue, reliable timeout approach) + ## [4.9.4] Released for version consistency with other DSW tools. @@ -304,3 +310,4 @@ Released for version consistency with other DSW tools. [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py index 8f5ce319..30be7f9e 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.9.4' +VERSION = '4.9.5' 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 6f621836..b8f3d29b 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.9.4" +version = "4.9.5" 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.9.4", - "dsw-config==4.9.4", - "dsw-database==4.9.4", - "dsw-storage==4.9.4", + "dsw-command-queue==4.9.5", + "dsw-config==4.9.5", + "dsw-database==4.9.5", + "dsw-storage==4.9.5", ] [project.urls] diff --git a/packages/dsw-database/CHANGELOG.md b/packages/dsw-database/CHANGELOG.md index 16c22426..e1e8c06f 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.9.5] + +Released for version consistency with other DSW tools. + ## [4.9.4] Released for version consistency with other DSW tools. @@ -269,3 +273,4 @@ Released for version consistency with other DSW tools. [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-database/pyproject.toml b/packages/dsw-database/pyproject.toml index f9476ecf..4af2f4d9 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.9.4" +version = "4.9.5" description = 'Library for managing DSW database' readme = 'README.md' keywords = ['dsw', 'database'] @@ -26,7 +26,7 @@ dependencies = [ 'psycopg[binary]', 'tenacity', # DSW - "dsw-config==4.9.4", + "dsw-config==4.9.5", ] [project.urls] diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md index c92ad42e..7a972653 100644 --- 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.9.5] + +### Fixed + +- Fixed command queue job timeout (moved support from workers to queue, reliable timeout approach) + ## [4.9.4] Released for version consistency with other DSW tools. @@ -322,3 +328,4 @@ Released for version consistency with other DSW tools. [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py index d6b8c4d8..96818405 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.9.4' +VERSION = '4.9.5' 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 51faf8a5..60a49f13 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.9.4" +version = "4.9.5" 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.9.4", - "dsw-config==4.9.4", - "dsw-database==4.9.4", - "dsw-storage==4.9.4", + "dsw-command-queue==4.9.5", + "dsw-config==4.9.5", + "dsw-database==4.9.5", + "dsw-storage==4.9.5", ] [project.urls] diff --git a/packages/dsw-mailer/CHANGELOG.md b/packages/dsw-mailer/CHANGELOG.md index 60ade470..f67c690c 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.9.5] + +### Fixed + +- Fixed command queue job timeout (moved support from workers to queue, reliable timeout approach) + ## [4.9.4] ### Fixed @@ -282,3 +288,4 @@ Released for version consistency with other DSW tools. [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py index 2d993d5a..1e87e06e 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.9.4' +VERSION = '4.9.5' 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 e9c0c83b..31528fe1 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.9.4" +version = "4.9.5" 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.9.4", - "dsw-config==4.9.4", - "dsw-database==4.9.4", + "dsw-command-queue==4.9.5", + "dsw-config==4.9.5", + "dsw-database==4.9.5", ] [project.urls] diff --git a/packages/dsw-models/CHANGELOG.md b/packages/dsw-models/CHANGELOG.md index e0476644..a4f8791a 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.9.5] + +Released for version consistency with other DSW tools. + ## [4.9.4] Released for version consistency with other DSW tools. @@ -175,3 +179,4 @@ Released for version consistency with other DSW tools. [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-models/pyproject.toml b/packages/dsw-models/pyproject.toml index 1ee2dd17..a4c60e4f 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.9.4" +version = "4.9.5" 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 8e448df1..9385fef7 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.9.5] + +Released for version consistency with other DSW tools. + ## [4.9.4] Released for version consistency with other DSW tools. @@ -242,3 +246,4 @@ Released for version consistency with other DSW tools. [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-storage/pyproject.toml b/packages/dsw-storage/pyproject.toml index 5d27e29f..9082cf61 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.9.4" +version = "4.9.5" 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.9.4", + "dsw-config==4.9.5", ] [project.urls] diff --git a/packages/dsw-tdk/CHANGELOG.md b/packages/dsw-tdk/CHANGELOG.md index 4e34bf97..631064c6 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.9.5] + +Released for version consistency with other DSW tools. + ## [4.9.4] Released for version consistency with other DSW tools. @@ -468,3 +472,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht [4.9.2]: /../../tree/v4.9.2 [4.9.3]: /../../tree/v4.9.3 [4.9.4]: /../../tree/v4.9.4 +[4.9.5]: /../../tree/v4.9.5 diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py index f3571c52..9827e187 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.9.4' +VERSION = '4.9.5' METAMODEL_VERSION = 13 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 c4db7581..420b2846 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.9.4" +version = "4.9.5" description = 'Data Stewardship Wizard Template Development Toolkit' readme = 'README.md' keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']