From 0b40851c07453f7f89ce9de1f380f6c3c9da7658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Mon, 25 Nov 2024 15:44:42 +0100 Subject: [PATCH 1/4] deps: Update dependencies --- packages/dsw-command-queue/requirements.txt | 6 +- packages/dsw-config/requirements.txt | 2 +- packages/dsw-data-seeder/requirements.txt | 15 +++-- packages/dsw-database/requirements.txt | 8 ++- packages/dsw-document-worker/pyproject.toml | 2 +- packages/dsw-document-worker/requirements.txt | 34 ++++++----- packages/dsw-mailer/requirements.txt | 21 +++---- packages/dsw-storage/requirements.txt | 10 ++- packages/dsw-tdk/requirements.test.txt | 38 +++++++++--- packages/dsw-tdk/requirements.txt | 18 +++--- requirements.txt | 61 +++++++++++-------- 11 files changed, 129 insertions(+), 86 deletions(-) diff --git a/packages/dsw-command-queue/requirements.txt b/packages/dsw-command-queue/requirements.txt index 1cf6c9c6..92ef31b3 100644 --- a/packages/dsw-command-queue/requirements.txt +++ b/packages/dsw-command-queue/requirements.txt @@ -1,7 +1,7 @@ func_timeout==4.3.5 -psycopg==3.2.2 -psycopg-binary==3.2.2 +psycopg==3.2.3 +psycopg-binary==3.2.3 PyYAML==6.0.2 tenacity==9.0.0 typing_extensions==4.12.2 -tzdata==2024.1 +tzdata==2024.2 diff --git a/packages/dsw-config/requirements.txt b/packages/dsw-config/requirements.txt index b77a4f2a..5debef99 100644 --- a/packages/dsw-config/requirements.txt +++ b/packages/dsw-config/requirements.txt @@ -1,4 +1,4 @@ certifi==2024.8.30 PyYAML==6.0.2 -sentry-sdk==2.14.0 +sentry-sdk==2.19.0 urllib3==2.2.3 diff --git a/packages/dsw-data-seeder/requirements.txt b/packages/dsw-data-seeder/requirements.txt index 89d830f3..9827ba96 100644 --- a/packages/dsw-data-seeder/requirements.txt +++ b/packages/dsw-data-seeder/requirements.txt @@ -1,12 +1,17 @@ +argon2-cffi==23.1.0 +argon2-cffi-bindings==21.2.0 certifi==2024.8.30 +cffi==1.17.1 click==8.1.7 func_timeout==4.3.5 -minio==7.2.8 -psycopg==3.2.2 -psycopg-binary==3.2.2 -python-dateutil==2.9.0 +minio==7.2.12 +psycopg==3.2.3 +psycopg-binary==3.2.3 +pycparser==2.22 +pycryptodome==3.21.0 +python-dateutil==2.9.0.post0 PyYAML==6.0.2 -sentry-sdk==2.14.0 +sentry-sdk==2.19.0 six==1.16.0 tenacity==9.0.0 typing_extensions==4.12.2 diff --git a/packages/dsw-database/requirements.txt b/packages/dsw-database/requirements.txt index 6713094d..711c6a95 100644 --- a/packages/dsw-database/requirements.txt +++ b/packages/dsw-database/requirements.txt @@ -1,6 +1,8 @@ -psycopg==3.2.2 -psycopg-binary==3.2.2 +certifi==2024.8.30 +psycopg==3.2.3 +psycopg-binary==3.2.3 PyYAML==6.0.2 +sentry-sdk==2.19.0 tenacity==9.0.0 typing_extensions==4.12.2 -tzdata==2024.1 +urllib3==2.2.3 diff --git a/packages/dsw-document-worker/pyproject.toml b/packages/dsw-document-worker/pyproject.toml index 3e3cb2be..18fe9877 100644 --- a/packages/dsw-document-worker/pyproject.toml +++ b/packages/dsw-document-worker/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ 'requests', 'sentry-sdk', 'tenacity', - 'weasyprint', + 'weasyprint==60.2', 'XlsxWriter', # DSW "dsw-command-queue==4.12.0", diff --git a/packages/dsw-document-worker/requirements.txt b/packages/dsw-document-worker/requirements.txt index bde9f278..3227ee4e 100644 --- a/packages/dsw-document-worker/requirements.txt +++ b/packages/dsw-document-worker/requirements.txt @@ -1,41 +1,43 @@ +argon2-cffi==23.1.0 +argon2-cffi-bindings==21.2.0 Brotli==1.1.0 certifi==2024.8.30 cffi==1.17.1 -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 click==8.1.7 cssselect2==0.7.0 -fonttools==4.53.1 +fonttools==4.55.0 func_timeout==4.3.5 html5lib==1.1 idna==3.10 -isodate==0.6.1 Jinja2==3.1.4 Markdown==3.7 -MarkupSafe==2.1.5 -minio==7.2.8 +MarkupSafe==3.0.2 +minio==7.2.12 panflute==2.3.1 pathvalidate==3.2.1 -Pillow==10.4.0 -psycopg==3.2.2 -psycopg-binary==3.2.2 +pillow==11.0.0 +psycopg==3.2.3 +psycopg-binary==3.2.3 pycparser==2.22 -pydyf==0.10.0 -pyparsing==3.1.4 -pyphen==0.16.0 -python-dateutil==2.9.0 +pycryptodome==3.21.0 +pydyf==0.11.0 +pyparsing==3.2.0 +pyphen==0.17.0 +python-dateutil==2.9.0.post0 python-slugify==8.0.4 PyYAML==6.0.2 -rdflib==7.0.0 +rdflib==7.1.1 rdflib-jsonld==0.6.2 requests==2.32.3 -sentry-sdk==2.14.0 +sentry-sdk==2.19.0 six==1.16.0 tenacity==9.0.0 text-unidecode==1.3 -tinycss2==1.3.0 +tinycss2==1.4.0 typing_extensions==4.12.2 urllib3==2.2.3 weasyprint==60.2 webencodings==0.5.1 XlsxWriter==3.2.0 -zopfli==0.2.3 +zopfli==0.2.3.post1 diff --git a/packages/dsw-mailer/requirements.txt b/packages/dsw-mailer/requirements.txt index c9419c7b..290d0349 100644 --- a/packages/dsw-mailer/requirements.txt +++ b/packages/dsw-mailer/requirements.txt @@ -1,23 +1,22 @@ -boto3==1.34.139 -botocore==1.34.139 +boto3==1.35.69 +botocore==1.35.69 certifi==2024.8.30 click==8.1.7 dkimpy==1.1.8 -dnspython==2.6.1 +dnspython==2.7.0 func_timeout==4.3.5 Jinja2==3.1.4 -Markdown==3.7 jmespath==1.0.1 -MarkupSafe==2.1.5 +Markdown==3.7 +MarkupSafe==3.0.2 pathvalidate==3.2.1 -psycopg==3.2.2 -psycopg-binary==3.2.2 -python-dateutil==2.9.0 +psycopg==3.2.3 +psycopg-binary==3.2.3 +python-dateutil==2.9.0.post0 PyYAML==6.0.2 -s3transfer==0.10.2 -sentry-sdk==2.14.0 +s3transfer==0.10.4 +sentry-sdk==2.19.0 six==1.16.0 tenacity==9.0.0 typing_extensions==4.12.2 -tzdata==2024.1 urllib3==2.2.3 diff --git a/packages/dsw-storage/requirements.txt b/packages/dsw-storage/requirements.txt index 2b20acbe..b3f3a767 100644 --- a/packages/dsw-storage/requirements.txt +++ b/packages/dsw-storage/requirements.txt @@ -1,6 +1,12 @@ +argon2-cffi==23.1.0 +argon2-cffi-bindings==21.2.0 certifi==2024.8.30 -minio==7.2.8 +cffi==1.17.1 +minio==7.2.12 +pycparser==2.22 +pycryptodome==3.21.0 PyYAML==6.0.2 -sentry-sdk==2.14.0 +sentry-sdk==2.19.0 tenacity==9.0.0 +typing_extensions==4.12.2 urllib3==2.2.3 diff --git a/packages/dsw-tdk/requirements.test.txt b/packages/dsw-tdk/requirements.test.txt index d08442ee..c39581c9 100644 --- a/packages/dsw-tdk/requirements.test.txt +++ b/packages/dsw-tdk/requirements.test.txt @@ -1,13 +1,31 @@ -attrs==23.2.0 -idna==3.7 +aiohappyeyeballs==2.4.3 +aiohttp==3.11.7 +aiosignal==1.3.1 +anyio==4.6.2.post1 +attrs==24.2.0 +click==8.1.7 +colorama==0.4.6 +frozenlist==1.5.0 +humanize==4.11.0 +idna==3.10 iniconfig==2.0.0 -multidict==6.0.5 -packaging==24.0 +Jinja2==3.1.4 +MarkupSafe==3.0.2 +multidict==6.1.0 +packaging==24.2 +pathspec==0.12.1 pluggy==1.5.0 -pytest==8.2.0 -pytest-recording==0.13.1 -PyYAML==6.0.1 +propcache==0.2.0 +pytest==8.3.3 +pytest-recording==0.13.2 +python-dotenv==1.0.1 +python-slugify==8.0.4 +PyYAML==6.0.2 six==1.16.0 -vcrpy==6.0.1 -wrapt==1.16.0 -yarl==1.9.4 +sniffio==1.3.1 +text-unidecode==1.3 +urllib3==2.2.3 +vcrpy==6.0.2 +watchfiles==1.0.0 +wrapt==1.17.0 +yarl==1.18.0 diff --git a/packages/dsw-tdk/requirements.txt b/packages/dsw-tdk/requirements.txt index 2cd49953..ad5eddf2 100644 --- a/packages/dsw-tdk/requirements.txt +++ b/packages/dsw-tdk/requirements.txt @@ -1,21 +1,21 @@ -aiohttp==3.10.5 +aiohappyeyeballs==2.4.3 +aiohttp==3.11.7 aiosignal==1.3.1 -anyio==4.6.0 -async-timeout==4.0.3 +anyio==4.6.2.post1 attrs==24.2.0 -charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -frozenlist==1.4.1 -humanize==4.10.0 +frozenlist==1.5.0 +humanize==4.11.0 idna==3.10 Jinja2==3.1.4 -MarkupSafe==2.1.5 +MarkupSafe==3.0.2 multidict==6.1.0 pathspec==0.12.1 +propcache==0.2.0 python-dotenv==1.0.1 python-slugify==8.0.4 sniffio==1.3.1 text-unidecode==1.3 -watchfiles==0.21.0 -yarl==1.11.1 +watchfiles==1.0.0 +yarl==1.18.0 diff --git a/requirements.txt b/requirements.txt index 03125346..1e26dc97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,56 +1,67 @@ -aiohttp==3.10.5 +aiohappyeyeballs==2.4.3 +aiohttp==3.11.7 aiosignal==1.3.1 -anyio==4.6.0 -async-timeout==4.0.3 +anyio==4.6.2.post1 +argon2-cffi==23.1.0 +argon2-cffi-bindings==21.2.0 attrs==24.2.0 +boto3==1.35.69 +botocore==1.35.69 Brotli==1.1.0 certifi==2024.8.30 cffi==1.17.1 -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 click==8.1.7 colorama==0.4.6 cssselect2==0.7.0 dkimpy==1.1.8 -dnspython==2.6.1 -fonttools==4.53.1 -frozenlist==1.4.1 +dnspython==2.7.0 +fonttools==4.55.0 +frozenlist==1.5.0 +func_timeout==4.3.5 html5lib==1.1 -humanize==4.10.0 +humanize==4.11.0 idna==3.10 -isodate==0.6.1 Jinja2==3.1.4 +jmespath==1.0.1 Markdown==3.7 -MarkupSafe==2.1.5 -mdx-breakless-lists==1.0.1 -minio==7.2.8 +MarkupSafe==3.0.2 +minio==7.2.12 multidict==6.1.0 +panflute==2.3.1 pathspec==0.12.1 pathvalidate==3.2.1 -Pillow==10.4.0 -psycopg==3.2.2 -psycopg-binary==3.2.2 +pillow==11.0.0 +propcache==0.2.0 +psycopg==3.2.3 +psycopg-binary==3.2.3 pycparser==2.22 -pydyf==0.10.0 -pyparsing==3.1.4 -pyphen==0.16.0 -python-dateutil==2.9.0 +pycryptodome==3.21.0 +pydyf==0.11.0 +pyparsing==3.2.0 +pyphen==0.17.0 +python-dateutil==2.9.0.post0 python-dotenv==1.0.1 python-slugify==8.0.4 PyYAML==6.0.2 -rdflib==7.0.0 +rdflib==7.1.1 rdflib-jsonld==0.6.2 requests==2.32.3 -sentry-sdk==2.14.0 +s3transfer==0.10.4 +sentry-sdk==2.19.0 +setuptools==75.6.0 six==1.16.0 sniffio==1.3.1 tenacity==9.0.0 text-unidecode==1.3 -tinycss2==1.3.0 +tinycss2==1.4.0 typing_extensions==4.12.2 -tzdata==2024.1 +tzdata==2024.2 urllib3==2.2.3 +watchfiles==1.0.0 weasyprint==60.2 webencodings==0.5.1 +wheel==0.45.1 XlsxWriter==3.2.0 -yarl==1.11.1 -zopfli==0.2.3 +yarl==1.18.0 +zopfli==0.2.3.post1 From e69c04ee522648ab578f6b122a9ef90632aa46a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Tue, 26 Nov 2024 10:33:56 +0100 Subject: [PATCH 2/4] feat(docworker): Add value question validations --- .../dsw/document_worker/consts.py | 2 +- .../dsw/document_worker/model/context.py | 55 ++++++++++++++++++- packages/dsw-tdk/dsw/tdk/consts.py | 2 +- packages/dsw-tdk/dsw/tdk/core.py | 1 + 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py index b1411cc6..31ec2e8c 100644 --- a/packages/dsw-document-worker/dsw/document_worker/consts.py +++ b/packages/dsw-document-worker/dsw/document_worker/consts.py @@ -1,7 +1,7 @@ CMD_CHANNEL = 'doc_worker' CMD_COMPONENT = 'doc_worker' COMPONENT_NAME = 'Document Worker' -CURRENT_METAMODEL = 15 +CURRENT_METAMODEL = 16 DEFAULT_ENCODING = 'utf-8' EXIT_SUCCESS = 0 NULL_UUID = '00000000-0000-0000-0000-000000000000' diff --git a/packages/dsw-document-worker/dsw/document_worker/model/context.py b/packages/dsw-document-worker/dsw/document_worker/model/context.py index e3888839..06da8b53 100644 --- a/packages/dsw-document-worker/dsw/document_worker/model/context.py +++ b/packages/dsw-document-worker/dsw/document_worker/model/context.py @@ -792,6 +792,53 @@ def cross_references(self) -> list[CrossReference]: return [r for r in self.references if isinstance(r, CrossReference)] +class ValueQuestionValidation: + SHORT_TYPE: dict[str, str] = { + 'MinLengthQuestionValidation': 'min-length', + 'MaxLengthQuestionValidation': 'max-length', + 'RegexQuestionValidation': 'regex', + 'OrcidQuestionValidation': 'orcid', + 'DoiQuestionValidation': 'doi', + 'MinNumberQuestionValidation': 'min', + 'MaxNumberQuestionValidation': 'max', + 'FromDateQuestionValidation': 'from-date', + 'ToDateQuestionValidation': 'to-date', + 'FromDateTimeQuestionValidation': 'from-datetime', + 'ToDateTimeQuestionValidation': 'to-datetime', + 'FromTimeQuestionValidation': 'from-time', + 'ToTimeQuestionValidation': 'to-time', + 'DomainQuestionValidation': 'domain', + } + VALUE_TYPE: dict[str, type | None] = { + 'MinLengthQuestionValidation': int, + 'MaxLengthQuestionValidation': int, + 'RegexQuestionValidation': str, + 'OrcidQuestionValidation': None, + 'DoiQuestionValidation': None, + 'MinNumberQuestionValidation': float, + 'MaxNumberQuestionValidation': float, + 'FromDateQuestionValidation': str, + 'ToDateQuestionValidation': str, + 'FromDateTimeQuestionValidation': str, + 'ToDateTimeQuestionValidation': str, + 'FromTimeQuestionValidation': str, + 'ToTimeQuestionValidation': str, + 'DomainQuestionValidation': str, + } + + def __init__(self, validation_type: str, value: str | int | float | None = None): + self.type = self.SHORT_TYPE.get(validation_type, 'unknown') + self.full_type = validation_type + self.value = value + + @staticmethod + def load(data: dict, **options): + return ValueQuestionValidation( + validation_type=data['type'], + value=data.get('value', None), + ) + + class ValueQuestion(Question): def __init__(self, uuid, title, text, tag_uuids, reference_uuids, @@ -800,6 +847,7 @@ def __init__(self, uuid, title, text, tag_uuids, reference_uuids, reference_uuids, expert_uuids, required_phase_uuid, annotations) self.value_type = value_type # type: str + self.validations = list() # type: list[ValueQuestionValidation] @property def a(self): @@ -846,7 +894,7 @@ def _resolve_links(self, ctx): @staticmethod def load(data: dict, **options): - return ValueQuestion( + question = ValueQuestion( uuid=data['uuid'], title=data['title'], text=data['text'], @@ -857,6 +905,9 @@ def load(data: dict, **options): value_type=data['valueType'], annotations=_load_annotations(data['annotations']), ) + question.validations = [ValueQuestionValidation.load(d, **options) + for d in data['validations']] + return question class OptionsQuestion(Question): @@ -1765,7 +1816,7 @@ def load(data: dict, **options): class DocumentContext: """Document Context smart representation""" - METAMODEL_VERSION = 15 + METAMODEL_VERSION = 16 def __init__(self, ctx, **options): self.metamodel_version = int(ctx.get('metamodelVersion', '0')) diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py index c2f1808c..c10a9c03 100644 --- a/packages/dsw-tdk/dsw/tdk/consts.py +++ b/packages/dsw-tdk/dsw/tdk/consts.py @@ -4,7 +4,7 @@ APP = 'dsw-tdk' VERSION = '4.12.0' -METAMODEL_VERSION = 15 +METAMODEL_VERSION = 16 REGEX_SEMVER = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$') REGEX_ORGANIZATION_ID = re.compile(r'^(?![.])(?!.*[.]$)[a-zA-Z0-9.]+$') diff --git a/packages/dsw-tdk/dsw/tdk/core.py b/packages/dsw-tdk/dsw/tdk/core.py index 49574d48..5f4f661a 100644 --- a/packages/dsw-tdk/dsw/tdk/core.py +++ b/packages/dsw-tdk/dsw/tdk/core.py @@ -50,6 +50,7 @@ def __init__(self, message: str, hint: str): 13: (4, 3, 0), 14: (4, 10, 0), 15: (4, 12, 0), + 16: (4, 13, 0), } From 448a488f42cee5289b31e9aafedb9a2edee3aacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Thu, 28 Nov 2024 16:10:14 +0100 Subject: [PATCH 3/4] fix: Revert pydyf dependency to 0.10.0 --- packages/dsw-document-worker/requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dsw-document-worker/requirements.txt b/packages/dsw-document-worker/requirements.txt index 3227ee4e..6273e7b7 100644 --- a/packages/dsw-document-worker/requirements.txt +++ b/packages/dsw-document-worker/requirements.txt @@ -21,7 +21,7 @@ psycopg==3.2.3 psycopg-binary==3.2.3 pycparser==2.22 pycryptodome==3.21.0 -pydyf==0.11.0 +pydyf==0.10.0 pyparsing==3.2.0 pyphen==0.17.0 python-dateutil==2.9.0.post0 diff --git a/requirements.txt b/requirements.txt index 1e26dc97..f8482644 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ psycopg==3.2.3 psycopg-binary==3.2.3 pycparser==2.22 pycryptodome==3.21.0 -pydyf==0.11.0 +pydyf==0.10.0 pyparsing==3.2.0 pyphen==0.17.0 python-dateutil==2.9.0.post0 From 791188c0503b3bc6dc1ecbb0a35f34e652667d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Tue, 3 Dec 2024 09:59:17 +0100 Subject: [PATCH 4/4] Release 4.13.0 --- packages/dsw-command-queue/CHANGELOG.md | 5 +++++ 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 | 5 +++++ 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 | 5 +++++ 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 | 11 ++++++++++- packages/dsw-tdk/dsw/tdk/consts.py | 2 +- packages/dsw-tdk/pyproject.toml | 2 +- 22 files changed, 79 insertions(+), 28 deletions(-) diff --git a/packages/dsw-command-queue/CHANGELOG.md b/packages/dsw-command-queue/CHANGELOG.md index 5e8f1688..b791e233 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.13.0] + +Released for version consistency with other DSW tools. + ## [4.12.0] Released for version consistency with other DSW tools. @@ -278,3 +282,4 @@ Released for version consistency with other DSW tools. [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-command-queue/pyproject.toml b/packages/dsw-command-queue/pyproject.toml index e5de7bbd..f2104196 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.12.0" +version = "4.13.0" 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.12.0", + "dsw-database==4.13.0", ] [project.urls] diff --git a/packages/dsw-config/CHANGELOG.md b/packages/dsw-config/CHANGELOG.md index 1fcb52c4..846d8568 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.13.0] + +Released for version consistency with other DSW tools. + ## [4.12.0] Released for version consistency with other DSW tools. @@ -288,3 +292,4 @@ Released for version consistency with other DSW tools. [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-config/pyproject.toml b/packages/dsw-config/pyproject.toml index 6d25c75e..182bc454 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.12.0" +version = "4.13.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 index 2fdaf128..d387652b 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.13.0] + +Released for version consistency with other DSW tools. + ## [4.12.0] Released for version consistency with other DSW tools. @@ -338,3 +342,4 @@ Released for version consistency with other DSW tools. [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py index f8c8e2c2..40609704 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.12.0' +VERSION = '4.13.0' 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 44218f5d..9e889633 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.12.0" +version = "4.13.0" 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.12.0", - "dsw-config==4.12.0", - "dsw-database==4.12.0", - "dsw-storage==4.12.0", + "dsw-command-queue==4.13.0", + "dsw-config==4.13.0", + "dsw-database==4.13.0", + "dsw-storage==4.13.0", ] [project.urls] diff --git a/packages/dsw-database/CHANGELOG.md b/packages/dsw-database/CHANGELOG.md index bfa2d979..3cfb8f3d 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.13.0] + +Released for version consistency with other DSW tools. + ## [4.12.0] Released for version consistency with other DSW tools. @@ -299,3 +303,4 @@ Released for version consistency with other DSW tools. [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-database/pyproject.toml b/packages/dsw-database/pyproject.toml index f3ae2cc9..92f03e48 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.12.0" +version = "4.13.0" description = 'Library for managing DSW database' readme = 'README.md' keywords = ['dsw', 'database'] @@ -26,7 +26,7 @@ dependencies = [ 'psycopg[binary]', 'tenacity', # DSW - "dsw-config==4.12.0", + "dsw-config==4.13.0", ] [project.urls] diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md index e26b2055..d19efdd7 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.13.0] + +### Changes + +- Added support for value question validations + ## [4.12.0] ### Changed @@ -362,3 +368,4 @@ Released for version consistency with other DSW tools. [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py index 31ec2e8c..1f22cefc 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.12.0' +VERSION = '4.13.0' 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 18fe9877..b0760c00 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.12.0" +version = "4.13.0" description = 'Worker for assembling and transforming documents' readme = 'README.md' keywords = ['documents', 'generation', 'jinja2', 'pandoc', 'worker'] @@ -38,10 +38,10 @@ dependencies = [ 'weasyprint==60.2', 'XlsxWriter', # DSW - "dsw-command-queue==4.12.0", - "dsw-config==4.12.0", - "dsw-database==4.12.0", - "dsw-storage==4.12.0", + "dsw-command-queue==4.13.0", + "dsw-config==4.13.0", + "dsw-database==4.13.0", + "dsw-storage==4.13.0", ] [project.urls] diff --git a/packages/dsw-mailer/CHANGELOG.md b/packages/dsw-mailer/CHANGELOG.md index cfe59f02..043a82a4 100644 --- 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.13.0] + +Released for version consistency with other DSW tools. + ## [4.12.0] Released for version consistency with other DSW tools. @@ -314,3 +318,4 @@ Released for version consistency with other DSW tools. [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py index a7abc3e9..4f02e89f 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.12.0' +VERSION = '4.13.0' 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 a556b0d5..cc9b8fb4 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.12.0" +version = "4.13.0" 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.12.0", - "dsw-config==4.12.0", - "dsw-database==4.12.0", + "dsw-command-queue==4.13.0", + "dsw-config==4.13.0", + "dsw-database==4.13.0", ] [project.urls] diff --git a/packages/dsw-models/CHANGELOG.md b/packages/dsw-models/CHANGELOG.md index 164fef9d..3cebdaa6 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.13.0] + +Released for version consistency with other DSW tools. + ## [4.12.0] Released for version consistency with other DSW tools. @@ -205,3 +209,4 @@ Released for version consistency with other DSW tools. [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-models/pyproject.toml b/packages/dsw-models/pyproject.toml index c13d226f..0c7cb086 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.12.0" +version = "4.13.0" 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 3f63f44a..2621c429 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.13.0] + +Released for version consistency with other DSW tools. + ## [4.12.0] Released for version consistency with other DSW tools. @@ -272,3 +276,4 @@ Released for version consistency with other DSW tools. [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-storage/pyproject.toml b/packages/dsw-storage/pyproject.toml index a6cc88d2..f420ce47 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.12.0" +version = "4.13.0" 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.12.0", + "dsw-config==4.13.0", ] [project.urls] diff --git a/packages/dsw-tdk/CHANGELOG.md b/packages/dsw-tdk/CHANGELOG.md index 8e764cfe..3228786f 100644 --- a/packages/dsw-tdk/CHANGELOG.md +++ b/packages/dsw-tdk/CHANGELOG.md @@ -8,9 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [4.13.0] + +### Changed + +- Added support for metamodel v16 + ## [4.12.0] -Released for version consistency with other DSW tools. +### Changed + +- Added support for metamodel v15 ## [4.11.0] @@ -500,3 +508,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht [4.10.6]: /../../tree/v4.10.6 [4.11.0]: /../../tree/v4.11.0 [4.12.0]: /../../tree/v4.12.0 +[4.13.0]: /../../tree/v4.13.0 diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py index c10a9c03..213e7069 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.12.0' +VERSION = '4.13.0' METAMODEL_VERSION = 16 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 4f92e016..78afdcae 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.12.0" +version = "4.13.0" description = 'Data Stewardship Wizard Template Development Toolkit' readme = 'README.md' keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']