Skip to content

Commit

Permalink
Merge pull request #178 from ds-wizard/hotfix/4.3.1
Browse files Browse the repository at this point in the history
Hotfix 4.3.1
  • Loading branch information
MarekSuchanek committed Feb 21, 2024
2 parents 4d1ca3f + d3359bd commit ece0510
Show file tree
Hide file tree
Showing 23 changed files with 79 additions and 28 deletions.
5 changes: 5 additions & 0 deletions packages/dsw-command-queue/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.3.1]

Released for version consistency with other DSW tools.

## [4.3.0]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -179,3 +183,4 @@ Released for version consistency with other DSW tools.
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
4 changes: 2 additions & 2 deletions packages/dsw-command-queue/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-command-queue'
version = "4.3.0"
version = "4.3.1"
description = 'Library for working with command queue and persistent commands'
readme = 'README.md'
keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
Expand All @@ -25,7 +25,7 @@ classifiers = [
requires-python = '>=3.10, <4'
dependencies = [
# DSW
"dsw-database==4.3.0",
"dsw-database==4.3.1",
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-config/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.3.1]

Released for version consistency with other DSW tools.

## [4.3.0]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -187,3 +191,4 @@ Released for version consistency with other DSW tools.
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
2 changes: 1 addition & 1 deletion packages/dsw-config/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-config'
version = "4.3.0"
version = "4.3.1"
description = 'Library for DSW config manipulation'
readme = 'README.md'
keywords = ['dsw', 'config', 'yaml', 'parser']
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-data-seeder/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.3.1]

Released for version consistency with other DSW tools.

## [4.3.0]

### Added
Expand Down Expand Up @@ -237,3 +241,4 @@ Released for version consistency with other DSW tools.
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
2 changes: 1 addition & 1 deletion packages/dsw-data-seeder/dsw/data_seeder/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
DEFAULT_PLACEHOLDER = '<<|TENANT-ID|>>'
NULL_UUID = '00000000-0000-0000-0000-000000000000'
PROG_NAME = 'dsw-data-seeder'
VERSION = '4.3.0'
VERSION = '4.3.1'

VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
VAR_WORKDIR_PATH = 'WORKDIR_PATH'
Expand Down
10 changes: 5 additions & 5 deletions packages/dsw-data-seeder/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-data-seeder'
version = "4.3.0"
version = "4.3.1"
description = 'Worker for seeding DSW data'
readme = 'README.md'
keywords = ['data', 'database', 'seed', 'storage']
Expand All @@ -29,10 +29,10 @@ dependencies = [
'sentry-sdk',
'tenacity',
# DSW
"dsw-command-queue==4.3.0",
"dsw-config==4.3.0",
"dsw-database==4.3.0",
"dsw-storage==4.3.0",
"dsw-command-queue==4.3.1",
"dsw-config==4.3.1",
"dsw-database==4.3.1",
"dsw-storage==4.3.1",
]

[project.urls]
Expand Down
7 changes: 7 additions & 0 deletions packages/dsw-database/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.3.1]

### Fixed

- Fix retrieving configs

## [4.3.0]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -194,3 +200,4 @@ Released for version consistency with other DSW tools.
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
4 changes: 4 additions & 0 deletions packages/dsw-database/dsw/database/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,8 @@ def get_currently_used_size(self, tenant_uuid: str):
after=tenacity.after_log(LOG, logging.DEBUG),
)
def get_tenant_config(self, tenant_uuid: str) -> Optional[DBTenantConfig]:
if not self._check_table_exists(table_name='tenant_config'):
return None
with self.conn_query.new_cursor(use_dict=True) as cursor:
try:
cursor.execute(
Expand Down Expand Up @@ -431,6 +433,8 @@ def update_component_info(self, name: str, version: str, built_at: datetime.date
after=tenacity.after_log(LOG, logging.DEBUG),
)
def get_component_info(self, name: str) -> Optional[DBComponent]:
if not self._check_table_exists(table_name='component'):
return None
with self.conn_query.new_cursor(use_dict=True) as cursor:
try:
cursor.execute(
Expand Down
4 changes: 2 additions & 2 deletions packages/dsw-database/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-database'
version = "4.3.0"
version = "4.3.1"
description = 'Library for managing DSW database'
readme = 'README.md'
keywords = ['dsw', 'database']
Expand All @@ -26,7 +26,7 @@ dependencies = [
'psycopg[binary]',
'tenacity',
# DSW
"dsw-config==4.3.0",
"dsw-config==4.3.1",
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-document-worker/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.3.1]

Released for version consistency with other DSW tools.

## [4.3.0]

### Added
Expand Down Expand Up @@ -240,3 +244,4 @@ Released for version consistency with other DSW tools.
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
4 changes: 2 additions & 2 deletions packages/dsw-document-worker/dsw/document_worker/consts.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
CMD_CHANNEL = 'doc_worker'
CMD_COMPONENT = 'doc_worker'
COMPONENT_NAME = 'Document Worker'
CURRENT_METAMODEL = 12
CURRENT_METAMODEL = 13
DEFAULT_ENCODING = 'utf-8'
EXIT_SUCCESS = 0
NULL_UUID = '00000000-0000-0000-0000-000000000000'
PROG_NAME = 'docworker'
VERSION = '4.3.0'
VERSION = '4.3.1'

VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
VAR_WORKDIR_PATH = 'WORKDIR_PATH'
Expand Down
10 changes: 5 additions & 5 deletions packages/dsw-document-worker/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-document-worker'
version = "4.3.0"
version = "4.3.1"
description = 'Worker for assembling and transforming documents'
readme = 'README.md'
keywords = ['documents', 'generation', 'jinja2', 'pandoc', 'worker']
Expand Down Expand Up @@ -40,10 +40,10 @@ dependencies = [
'weasyprint',
'XlsxWriter',
# DSW
"dsw-command-queue==4.3.0",
"dsw-config==4.3.0",
"dsw-database==4.3.0",
"dsw-storage==4.3.0",
"dsw-command-queue==4.3.1",
"dsw-config==4.3.1",
"dsw-database==4.3.1",
"dsw-storage==4.3.1",
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-mailer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.3.1]

Released for version consistency with other DSW tools.

## [4.3.0]

### Added
Expand Down Expand Up @@ -207,3 +211,4 @@ Released for version consistency with other DSW tools.
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
2 changes: 1 addition & 1 deletion packages/dsw-mailer/dsw/mailer/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
DEFAULT_ENCODING = 'utf-8'
NULL_UUID = '00000000-0000-0000-0000-000000000000'
PROG_NAME = 'dsw-mailer'
VERSION = '4.3.0'
VERSION = '4.3.1'

VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
VAR_WORKDIR_PATH = 'WORKDIR_PATH'
8 changes: 4 additions & 4 deletions packages/dsw-mailer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-mailer'
version = "4.3.0"
version = "4.3.1"
description = 'Worker for sending email notifications'
readme = 'README.md'
keywords = ['email', 'jinja2', 'notification', 'template']
Expand All @@ -31,9 +31,9 @@ dependencies = [
'sentry-sdk',
'tenacity',
# DSW
"dsw-command-queue==4.3.0",
"dsw-config==4.3.0",
"dsw-database==4.3.0",
"dsw-command-queue==4.3.1",
"dsw-config==4.3.1",
"dsw-database==4.3.1",
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-models/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.3.1]

Released for version consistency with other DSW tools.

## [4.3.0]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -110,3 +114,4 @@ Released for version consistency with other DSW tools.
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
2 changes: 1 addition & 1 deletion packages/dsw-models/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-models'
version = "4.3.0"
version = "4.3.1"
description = 'Library with DSW models and basic IO operations'
readme = 'README.md'
keywords = ['dsw', 'config', 'yaml', 'parser']
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-storage/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [4.3.1]

Released for version consistency with other DSW tools.

## [4.3.0]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -177,3 +181,4 @@ Released for version consistency with other DSW tools.
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
4 changes: 2 additions & 2 deletions packages/dsw-storage/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-storage'
version = "4.3.0"
version = "4.3.1"
description = 'Library for managing DSW S3 storage'
readme = 'README.md'
keywords = ['dsw', 's3', 'bucket', 'storage']
Expand All @@ -26,7 +26,7 @@ dependencies = [
'minio',
'tenacity',
# DSW
"dsw-config==4.3.0",
"dsw-config==4.3.1",
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-tdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]


## [4.3.1]

Released for version consistency with other DSW tools.

## [4.3.0]

### Fixed
Expand Down Expand Up @@ -399,3 +403,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
[4.2.0]: /../../tree/v4.2.0
[4.2.1]: /../../tree/v4.2.1
[4.3.0]: /../../tree/v4.3.0
[4.3.1]: /../../tree/v4.3.1
2 changes: 1 addition & 1 deletion packages/dsw-tdk/dsw/tdk/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import re

APP = 'dsw-tdk'
VERSION = '4.3.0'
VERSION = '4.3.1'
METAMODEL_VERSION = 13

REGEX_SEMVER = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$')
Expand Down
2 changes: 1 addition & 1 deletion packages/dsw-tdk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = 'dsw-tdk'
version = "4.3.0"
version = "4.3.1"
description = 'Data Stewardship Wizard Template Development Toolkit'
readme = 'README.md'
keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']
Expand Down

0 comments on commit ece0510

Please sign in to comment.