Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 3.16.0 (develop) #23

Merged
merged 3 commits into from
Oct 4, 2022
Merged

Release 3.16.0 (develop) #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
500aed4
Release 3.16.0-RC.1
MarekSuchanek Sep 30, 2022
cbc893d
Fix missing integration in context
MarekSuchanek Sep 30, 2022
04b3449
Release 3.16.0
MarekSuchanek Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/dsw-command-queue/CHANGELOG.md
View file
Open in desktop
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]


## [3.16.0]

Released for version consistency with other DSW tools.

## [3.15.3]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -42,3 +46,4 @@ Released for version consistency with other DSW tools.
[3.15.1]: /../../tree/v3.15.1
[3.15.2]: /../../tree/v3.15.2
[3.15.3]: /../../tree/v3.15.3
[3.16.0]: /../../tree/v3.16.0
4 changes: 2 additions & 2 deletions packages/dsw-command-queue/pyproject.toml
View file
Open in desktop
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 = '3.15.3'
version = '3.16.0'
description = 'Library for working with command queue and persistent commands'
readme = 'README.md'
keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
Expand All @@ -27,7 +27,7 @@ classifiers = [
requires-python = '>=3.7, <4'
dependencies = [
# DSW
'dsw-database==3.15.3',
'dsw-database==3.16.0',
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-config/CHANGELOG.md
View file
Open in desktop
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]


## [3.16.0]

Released for version consistency with other DSW tools.

## [3.15.3]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -42,3 +46,4 @@ Released for version consistency with other DSW tools.
[3.15.1]: /../../tree/v3.15.1
[3.15.2]: /../../tree/v3.15.2
[3.15.3]: /../../tree/v3.15.3
[3.16.0]: /../../tree/v3.16.0
2 changes: 1 addition & 1 deletion packages/dsw-config/pyproject.toml
View file
Open in desktop
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 = '3.15.3'
version = '3.16.0'
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
View file
Open in desktop
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]


## [3.16.0]

Released for version consistency with other DSW tools.

## [3.15.3]

### Fixed
Expand Down Expand Up @@ -83,3 +87,4 @@ Released for version consistency with other DSW tools.
[3.15.1]: /../../tree/v3.15.1
[3.15.2]: /../../tree/v3.15.2
[3.15.3]: /../../tree/v3.15.3
[3.16.0]: /../../tree/v3.16.0
2 changes: 1 addition & 1 deletion packages/dsw-data-seeder/dsw/data_seeder/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROG_NAME = 'dsw-seeder'
VERSION = '3.15.3'
VERSION = '3.16.0'
NULL_UUID = '00000000-0000-0000-0000-000000000000'

LOGGER_NAME = 'DSW_DATA_SEEDER'
Expand Down
10 changes: 5 additions & 5 deletions packages/dsw-data-seeder/pyproject.toml
View file
Open in desktop
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 = '3.15.3'
version = '3.16.0'
description = 'Worker for seeding DSW data'
readme = 'README.md'
keywords = ['data', 'database', 'seed', 'storage']
Expand All @@ -27,10 +27,10 @@ dependencies = [
'click',
'tenacity',
# DSW
'dsw-command-queue==3.15.3',
'dsw-config==3.15.3',
'dsw-database==3.15.3',
'dsw-storage==3.15.3',
'dsw-command-queue==3.16.0',
'dsw-config==3.16.0',
'dsw-database==3.16.0',
'dsw-storage==3.16.0',
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-database/CHANGELOG.md
View file
Open in desktop
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]


## [3.16.0]

Released for version consistency with other DSW tools.

## [3.15.3]

### Fixed
Expand Down Expand Up @@ -44,3 +48,4 @@ Released for version consistency with other DSW tools.
[3.15.1]: /../../tree/v3.15.1
[3.15.2]: /../../tree/v3.15.2
[3.15.3]: /../../tree/v3.15.3
[3.16.0]: /../../tree/v3.16.0
4 changes: 2 additions & 2 deletions packages/dsw-database/pyproject.toml
View file
Open in desktop
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 = '3.15.3'
version = '3.16.0'
description = 'Library for managing DSW database'
readme = 'README.md'
keywords = ['dsw', 'database']
Expand All @@ -28,7 +28,7 @@ dependencies = [
'psycopg2',
'tenacity',
# DSW
'dsw-config==3.15.3',
'dsw-config==3.16.0',
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-document-worker/CHANGELOG.md
View file
Open in desktop
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]


## [3.16.0]

Released for version consistency with other DSW tools.

## [3.15.3]

### Fixed
Expand Down Expand Up @@ -51,3 +55,4 @@ Released for version consistency with other DSW tools.
[3.15.1]: /../../tree/v3.15.1
[3.15.2]: /../../tree/v3.15.2
[3.15.3]: /../../tree/v3.15.3
[3.16.0]: /../../tree/v3.16.0
2 changes: 1 addition & 1 deletion packages/dsw-document-worker/dsw/document_worker/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DEFAULT_ENCODING = 'utf-8'
EXIT_SUCCESS = 0
VERSION = '3.15.3'
VERSION = '3.16.0'
PROG_NAME = 'docworker'
LOGGER_NAME = 'docworker'
CURRENT_METAMODEL = 10
Expand Down
24 changes: 23 additions & 1 deletion packages/dsw-document-worker/dsw/document_worker/model/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,25 @@ def __init__(self, uuid, name, logo, integration_id, item_url, props, rq_body,
self.rs_item_id = rs_item_id # type: str
self.rs_item_template = rs_item_template # type: str

@staticmethod
def default():
return ApiIntegration(
uuid=NULL_UUID,
name='',
logo='',
integration_id='',
item_url='',
props={},
rq_body='',
rq_method='GET',
rq_url='',
rq_headers={},
rs_list_field='',
rs_item_id='',
rs_item_template='',
annotations={},
)

@staticmethod
def load(data: dict, **options):
return ApiIntegration(
Expand Down Expand Up @@ -836,7 +855,10 @@ def __init__(self, uuid, title, text, tag_uuids, reference_uuids, props,

def _resolve_links(self, ctx):
super()._resolve_links_parent(ctx)
self.integration = ctx.e.integrations[self.integration_uuid]
self.integration = ctx.e.integrations.get(
self.integration_uuid,
ApiIntegration.default(),
)

@staticmethod
def load(data: dict, **options):
Expand Down
10 changes: 5 additions & 5 deletions packages/dsw-document-worker/pyproject.toml
View file
Open in desktop
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 = '3.15.3'
version = '3.16.0'
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 = [
'sentry-sdk',
'tenacity',
# DSW
'dsw-command-queue==3.15.3',
'dsw-config==3.15.3',
'dsw-database==3.15.3',
'dsw-storage==3.15.3',
'dsw-command-queue==3.16.0',
'dsw-config==3.16.0',
'dsw-database==3.16.0',
'dsw-storage==3.16.0',
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-mailer/CHANGELOG.md
View file
Open in desktop
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]


## [3.16.0]

Released for version consistency with other DSW tools.

## [3.15.3]

### Fixed
Expand Down Expand Up @@ -49,3 +53,4 @@ Released for version consistency with other DSW tools.
[3.15.1]: /../../tree/v3.15.1
[3.15.2]: /../../tree/v3.15.2
[3.15.3]: /../../tree/v3.15.3
[3.16.0]: /../../tree/v3.16.0
2 changes: 1 addition & 1 deletion packages/dsw-mailer/dsw/mailer/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROG_NAME = 'dsw-mailer'
VERSION = '3.15.3'
VERSION = '3.16.0'

LOGGER_NAME = 'mailer'

Expand Down
8 changes: 4 additions & 4 deletions packages/dsw-mailer/pyproject.toml
View file
Open in desktop
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 = '3.15.3'
version = '3.16.0'
description = 'Worker for sending email notifications'
readme = 'README.md'
keywords = ['email', 'jinja2', 'notification', 'template']
Expand All @@ -29,9 +29,9 @@ dependencies = [
'sentry-sdk',
'tenacity',
# DSW
'dsw-command-queue==3.15.3',
'dsw-config==3.15.3',
'dsw-database==3.15.3',
'dsw-command-queue==3.16.0',
'dsw-config==3.16.0',
'dsw-database==3.16.0',
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-storage/CHANGELOG.md
View file
Open in desktop
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]


## [3.16.0]

Released for version consistency with other DSW tools.

## [3.15.3]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -42,3 +46,4 @@ Released for version consistency with other DSW tools.
[3.15.1]: /../../tree/v3.15.1
[3.15.2]: /../../tree/v3.15.2
[3.15.3]: /../../tree/v3.15.3
[3.16.0]: /../../tree/v3.16.0
4 changes: 2 additions & 2 deletions packages/dsw-storage/pyproject.toml
View file
Open in desktop
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 = '3.15.3'
version = '3.16.0'
description = 'Library for managing DSW S3 storage'
readme = 'README.md'
keywords = ['dsw', 's3', 'bucket', 'storage']
Expand All @@ -28,7 +28,7 @@ dependencies = [
'minio',
'tenacity',
# DSW
'dsw-config==3.15.3',
'dsw-config==3.16.0',
]

[project.urls]
Expand Down
5 changes: 5 additions & 0 deletions packages/dsw-tdk/CHANGELOG.md
View file
Open in desktop
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]


## [3.16.0]

Released for version consistency with other DSW tools.

## [3.15.3]

Released for version consistency with other DSW tools.
Expand Down Expand Up @@ -228,3 +232,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht
[3.15.1]: /../../tree/v3.15.1
[3.15.2]: /../../tree/v3.15.2
[3.15.3]: /../../tree/v3.15.3
[3.16.0]: /../../tree/v3.16.0
2 changes: 1 addition & 1 deletion packages/dsw-tdk/dsw/tdk/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re

APP = 'dsw-tdk'
VERSION = '3.15.3'
VERSION = '3.16.0'
METAMODEL_VERSION = 10

REGEX_SEMVER = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$')
Expand Down
2 changes: 1 addition & 1 deletion packages/dsw-tdk/pyproject.toml
View file
Open in desktop
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 = '3.15.3'
version = '3.16.0'
description = 'Data Stewardship Wizard Template Development Toolkit'
readme = 'README.md'
keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']
Expand Down