From acf1a38233aa715ae1452b5425dd3a64b21e3ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Fri, 6 Sep 2024 13:04:39 +0200 Subject: [PATCH 1/2] fix: Fix build-info.sh script for Git tags --- .github/workflows/build.yml | 123 +++++++++++++++++++++++++++++++++++ .github/workflows/lambda.yml | 122 ---------------------------------- scripts/build-info.sh | 2 +- 3 files changed, 124 insertions(+), 123 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e903d975..68840ea0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -193,3 +193,126 @@ jobs: push: true tags: ${{ steps.meta-public.outputs.tags }} labels: ${{ steps.meta-public.outputs.labels }} + + lambda-docker: + name: Docker (lambda) + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + package: + - dsw-document-worker + + env: + PUBLIC_IMAGE_PREFIX: 'datastewardshipwizard' + DOCKER_META_CONTEXT: '.' + DOCKER_META_FILE: './packages/${{ matrix.package }}/lambda.Dockerfile' + DOCKER_META_PLATFORMS: 'linux/amd64' + DOCKER_META_SUFFIX_LAMBDA: '-lambda' + + steps: + - name: Check out repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v3 + + - name: Get Docker image name + id: docker-image-name + run: | + cd packages/${{ matrix.package }} + NAME=$(make docker-image-name) + echo "NAME=$NAME" >> $GITHUB_OUTPUT + + - name: Create build info + run: | + bash scripts/build-info.sh + + # TEST DOCKER IMAGE BUILD + - name: Docker meta [test] + id: meta-test + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.PUBLIC_IMAGE_PREFIX }}/${{ steps.docker-image-name.outputs.NAME }} + tags: | + type=sha + flavor: | + suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }} + + - name: Docker build [test] + uses: docker/build-push-action@v6 + with: + context: ${{ env.DOCKER_META_CONTEXT }} + file: ${{ env.DOCKER_META_FILE }} + platforms: ${{ env.DOCKER_META_PLATFORMS }} + push: false + tags: ${{ steps.meta-test.outputs.tags }} + labels: ${{ steps.meta-test.outputs.labels }} + + # PREPARE + - name: Docker login [docker.io] + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_PASSWORD }} + + # DEVELOPMENT IMAGES + - name: Docker meta [dev] + id: meta-dev + if: github.event_name != 'pull_request' + uses: docker/metadata-action@v5 + with: + images: | + ${{ secrets.DOCKER_HUB_USERNAME }}/${{ steps.docker-image-name.outputs.NAME }} + tags: | + type=ref,event=branch + flavor: | + suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }} + + - name: Docker build+push [dev] + uses: docker/build-push-action@v6 + if: github.event_name != 'pull_request' && steps.meta-dev.outputs.tags != '' + with: + context: ${{ env.DOCKER_META_CONTEXT }} + file: ${{ env.DOCKER_META_FILE }} + platforms: ${{ env.DOCKER_META_PLATFORMS }} + push: true + tags: ${{ steps.meta-dev.outputs.tags }} + labels: ${{ steps.meta-dev.outputs.labels }} + + # PUBLIC IMAGES + - name: Docker meta [public] + id: meta-public + if: github.event_name != 'pull_request' + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.PUBLIC_IMAGE_PREFIX }}/${{ steps.docker-image-name.outputs.NAME }} + ${{ secrets.DOCKER_HUB_USERNAME }}/${{ steps.docker-image-name.outputs.NAME }} + tags: | + type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }} + flavor: | + suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }} + + - name: Docker build+push [public] + uses: docker/build-push-action@v6 + if: github.event_name != 'pull_request' && steps.meta-public.outputs.tags != '' + with: + context: ${{ env.DOCKER_META_CONTEXT }} + file: ${{ env.DOCKER_META_FILE }} + platforms: ${{ env.DOCKER_META_PLATFORMS }} + push: true + tags: ${{ steps.meta-public.outputs.tags }} + labels: ${{ steps.meta-public.outputs.labels }} diff --git a/.github/workflows/lambda.yml b/.github/workflows/lambda.yml index 5c41a62e..48ff34ec 100644 --- a/.github/workflows/lambda.yml +++ b/.github/workflows/lambda.yml @@ -46,125 +46,3 @@ jobs: with: name: ${{ matrix.package }}-lambda.zip path: packages/dsw-${{ matrix.package }}/${{ matrix.package }}-lambda.zip - - docker: - name: Lambda Docker Image - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - package: - - dsw-document-worker - - env: - PUBLIC_IMAGE_PREFIX: 'datastewardshipwizard' - DOCKER_META_CONTEXT: '.' - DOCKER_META_FILE: './packages/${{ matrix.package }}/lambda.Dockerfile' - DOCKER_META_PLATFORMS: 'linux/amd64' - DOCKER_META_SUFFIX_LAMBDA: '-lambda' - - steps: - - name: Check out repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - - - name: Get Docker image name - id: docker-image-name - run: | - cd packages/${{ matrix.package }} - NAME=$(make docker-image-name) - echo "NAME=$NAME" >> $GITHUB_OUTPUT - - - name: Create build info - run: | - bash scripts/build-info.sh - - # TEST DOCKER IMAGE BUILD - - name: Docker meta [test] - id: meta-test - uses: docker/metadata-action@v5 - with: - images: | - ${{ env.PUBLIC_IMAGE_PREFIX }}/${{ steps.docker-image-name.outputs.NAME }} - tags: | - type=sha - flavor: | - suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }} - - - name: Docker build [test] - uses: docker/build-push-action@v6 - with: - context: ${{ env.DOCKER_META_CONTEXT }} - file: ${{ env.DOCKER_META_FILE }} - platforms: ${{ env.DOCKER_META_PLATFORMS }} - push: false - tags: ${{ steps.meta-test.outputs.tags }} - labels: ${{ steps.meta-test.outputs.labels }} - - # PREPARE - - name: Docker login [docker.io] - if: github.event_name != 'pull_request' - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} - - # DEVELOPMENT IMAGES - - name: Docker meta [dev] - id: meta-dev - if: github.event_name != 'pull_request' - uses: docker/metadata-action@v5 - with: - images: | - ${{ secrets.DOCKER_HUB_USERNAME }}/${{ steps.docker-image-name.outputs.NAME }} - tags: | - type=ref,event=branch - flavor: | - suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }} - - - name: Docker build+push [dev] - uses: docker/build-push-action@v6 - if: github.event_name != 'pull_request' && steps.meta-dev.outputs.tags != '' - with: - context: ${{ env.DOCKER_META_CONTEXT }} - file: ${{ env.DOCKER_META_FILE }} - platforms: ${{ env.DOCKER_META_PLATFORMS }} - push: true - tags: ${{ steps.meta-dev.outputs.tags }} - labels: ${{ steps.meta-dev.outputs.labels }} - - # PUBLIC IMAGES - - name: Docker meta [public] - id: meta-public - if: github.event_name != 'pull_request' - uses: docker/metadata-action@v5 - with: - images: | - ${{ env.PUBLIC_IMAGE_PREFIX }}/${{ steps.docker-image-name.outputs.NAME }} - tags: | - type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }} - flavor: | - suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }} - - - name: Docker build+push [public] - uses: docker/build-push-action@v6 - if: github.event_name != 'pull_request' && steps.meta-public.outputs.tags != '' - with: - context: ${{ env.DOCKER_META_CONTEXT }} - file: ${{ env.DOCKER_META_FILE }} - platforms: ${{ env.DOCKER_META_PLATFORMS }} - push: true - tags: ${{ steps.meta-public.outputs.tags }} - labels: ${{ steps.meta-public.outputs.labels }} diff --git a/scripts/build-info.sh b/scripts/build-info.sh index 21f379cb..90995549 100755 --- a/scripts/build-info.sh +++ b/scripts/build-info.sh @@ -9,7 +9,7 @@ branch=$(git rev-parse --abbrev-ref HEAD) commit=$(git rev-parse --short HEAD) sha=$(git rev-parse HEAD) version="$branch~$commit" -gittag=$(git tag -l --contains HEAD | head -n 1) +gittag=$(git tag --points-at HEAD | head -n 1) if test -n "$gittag" then version="$gittag~$commit" From e5555d85d503574a0a31ef9e074ec5b8cc690b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Fri, 6 Sep 2024 13:05:40 +0200 Subject: [PATCH 2/2] Hotfix 4.10.2 --- 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 | 5 +++++ .../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 | 5 +++++ packages/dsw-tdk/dsw/tdk/consts.py | 2 +- packages/dsw-tdk/pyproject.toml | 2 +- 22 files changed, 72 insertions(+), 27 deletions(-) diff --git a/packages/dsw-command-queue/CHANGELOG.md b/packages/dsw-command-queue/CHANGELOG.md index 0eb9569d..0ef1ce95 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.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] Released for version consistency with other DSW tools. @@ -241,3 +245,4 @@ Released for version consistency with other DSW tools. [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-command-queue/pyproject.toml b/packages/dsw-command-queue/pyproject.toml index f01436be..cdf9cac2 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.1" +version = "4.10.2" 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.1", + "dsw-database==4.10.2", ] [project.urls] diff --git a/packages/dsw-config/CHANGELOG.md b/packages/dsw-config/CHANGELOG.md index 67d80356..5ddb7843 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.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] Released for version consistency with other DSW tools. @@ -253,3 +257,4 @@ Released for version consistency with other DSW tools. [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-config/pyproject.toml b/packages/dsw-config/pyproject.toml index e39af11f..df061722 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.1" +version = "4.10.2" 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 3f4de9d0..f26ac665 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.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] Released for version consistency with other DSW tools. @@ -297,3 +301,4 @@ Released for version consistency with other DSW tools. [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py index 21251c1e..e26f1a65 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.0' +VERSION = '4.10.2' 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 3c7911e9..8ab9ba6a 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.1" +version = "4.10.2" 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.1", - "dsw-config==4.10.1", - "dsw-database==4.10.1", - "dsw-storage==4.10.1", + "dsw-command-queue==4.10.2", + "dsw-config==4.10.2", + "dsw-database==4.10.2", + "dsw-storage==4.10.2", ] [project.urls] diff --git a/packages/dsw-database/CHANGELOG.md b/packages/dsw-database/CHANGELOG.md index 0f4b9ddd..5d47cd5b 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.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] Released for version consistency with other DSW tools. @@ -264,3 +268,4 @@ Released for version consistency with other DSW tools. [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-database/pyproject.toml b/packages/dsw-database/pyproject.toml index a4568489..7ce274e7 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.1" +version = "4.10.2" 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.1", + "dsw-config==4.10.2", ] [project.urls] diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md index d728b7e7..4cfb0bd6 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.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] Released for version consistency with other DSW tools. @@ -319,3 +323,4 @@ Released for version consistency with other DSW tools. [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py index 7616de99..2c4f435e 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.0' +VERSION = '4.10.2' 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 59fbf29a..2241c722 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.1" +version = "4.10.2" 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.1", - "dsw-config==4.10.1", - "dsw-database==4.10.1", - "dsw-storage==4.10.1", + "dsw-command-queue==4.10.2", + "dsw-config==4.10.2", + "dsw-database==4.10.2", + "dsw-storage==4.10.2", ] [project.urls] diff --git a/packages/dsw-mailer/CHANGELOG.md b/packages/dsw-mailer/CHANGELOG.md index 96eed7c5..7576cca2 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.10.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] Released for version consistency with other DSW tools. @@ -273,3 +277,4 @@ Released for version consistency with other DSW tools. [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py index c14d6cee..d47153cd 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.0' +VERSION = '4.10.2' 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 43946af0..30f71e5b 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.1" +version = "4.10.2" 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.1", - "dsw-config==4.10.1", - "dsw-database==4.10.1", + "dsw-command-queue==4.10.2", + "dsw-config==4.10.2", + "dsw-database==4.10.2", ] [project.urls] diff --git a/packages/dsw-models/CHANGELOG.md b/packages/dsw-models/CHANGELOG.md index 9ac6957a..21c9afb6 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.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] Released for version consistency with other DSW tools. @@ -170,3 +174,4 @@ Released for version consistency with other DSW tools. [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-models/pyproject.toml b/packages/dsw-models/pyproject.toml index cae12edf..a1cc9d15 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.1" +version = "4.10.2" 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 2fbd05b2..b5e39f0b 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.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] Released for version consistency with other DSW tools. @@ -237,3 +241,4 @@ Released for version consistency with other DSW tools. [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-storage/pyproject.toml b/packages/dsw-storage/pyproject.toml index 489c8683..495d957d 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.1" +version = "4.10.2" 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.1", + "dsw-config==4.10.2", ] [project.urls] diff --git a/packages/dsw-tdk/CHANGELOG.md b/packages/dsw-tdk/CHANGELOG.md index c767139f..7ce3a4b2 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.2] + +Released for version consistency with other DSW tools. + ## [4.10.1] ### Fixed @@ -463,3 +467,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht [4.9.1]: /../../tree/v4.9.1 [4.10.0]: /../../tree/v4.10.0 [4.10.1]: /../../tree/v4.10.1 +[4.10.2]: /../../tree/v4.10.2 diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py index a646ba0e..73f62b3b 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.0' +VERSION = '4.10.2' 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 f2ed3771..82efe66b 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.1" +version = "4.10.2" description = 'Data Stewardship Wizard Template Development Toolkit' readme = 'README.md' keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']