diff --git a/.github/actions/python-environment/action.yml b/.github/actions/python-environment/action.yml index b8a5db9ed..934ee1976 100644 --- a/.github/actions/python-environment/action.yml +++ b/.github/actions/python-environment/action.yml @@ -52,17 +52,18 @@ runs: - name: Setup cache variables id: setup-cache-variables + working-directory: ${{ inputs.working-directory }} shell: bash run: | echo "ImageOS=$ImageOS" echo "ImageVersion=$ImageVersion" POETRY_ENV_PATH=$(poetry config virtualenvs.path) - POETRY_SHA=$(sha256sum poetry.lock | awk '{print $1}') #Remove trailing filename - echo "POETRY_ENV_PATH=$POETRY_ENV_PATH" >> $GITHUB_OUTPUT + POETRY_SHA=$(cat pyproject.toml poetry.lock | sha256sum | cut -f 1 -d " ") #Remove trailing dash + # output to GITHUB_OUTPUT echo "IMAGE_OS=$ImageOS" >> $GITHUB_OUTPUT echo "IMAGE_VERSION=$ImageVersion" >> $GITHUB_OUTPUT + echo "POETRY_ENV_PATH=$POETRY_ENV_PATH" >> $GITHUB_OUTPUT echo "POETRY_SHA=$POETRY_SHA" >> $GITHUB_OUTPUT - - name: Cache Poetry environment if: inputs.use-cache == 'true' diff --git a/.github/actions/security-issues/action.yml b/.github/actions/security-issues/action.yml index a4388bd07..10a591e59 100644 --- a/.github/actions/security-issues/action.yml +++ b/.github/actions/security-issues/action.yml @@ -39,7 +39,7 @@ runs: - name: Install Python Toolbox / Security tool shell: bash run: | - pip install exasol-toolbox==1.12.0 + pip install exasol-toolbox==1.13.0 - name: Create Security Issue Report shell: bash diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index b4332a83a..eeeda92ee 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,6 +1,7 @@ # Changelog * [unreleased](unreleased.md) +* [1.13.0](changes_1.13.0.md) * [1.12.0](changes_1.12.0.md) * [1.11.0](changes_1.11.0.md) * [1.10.0](changes_1.10.0.md) @@ -49,6 +50,7 @@ hidden: --- unreleased +changes_1.13.0 changes_1.12.0 changes_1.11.0 changes_1.10.0 diff --git a/doc/changes/changes_1.13.0.md b/doc/changes/changes_1.13.0.md new file mode 100644 index 000000000..b09ac9d4a --- /dev/null +++ b/doc/changes/changes_1.13.0.md @@ -0,0 +1,17 @@ +# 1.13.0 - 2025-10-31 + +## Summary + +This releases fixes Nox session `release:prepare` for multi-project repositories and +fixes the `python-environment` GitHub action to also use the `working-directory` +and `pyproject.toml` setting the cache variables. + +## Bugfixes + +* #580: Fixed Nox session `release:prepare` for multi-project repositories +* #586: Fixed `python-environment` GitHub action to use `working-directory` for setup of cache variables +* #559: Added SHA of `pyproject.toml` to determine cache key in `python-environment` GitHub action + +## Features + +* #485: Improved nox task `release:trigger` diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md index 154da4af5..79e701b84 100644 --- a/doc/changes/unreleased.md +++ b/doc/changes/unreleased.md @@ -1,13 +1 @@ # Unreleased - -## Summary - -This releases fixes Nox session `release:prepare` for multi-project repositories. - -## Bugfixes - -* #580: Fixed Nox session `release:prepare` for multi-project repositories - -## Features - -* #485: Improved nox task `release:trigger` diff --git a/exasol/toolbox/version.py b/exasol/toolbox/version.py index 8842ebe86..fa812ffd3 100644 --- a/exasol/toolbox/version.py +++ b/exasol/toolbox/version.py @@ -9,7 +9,7 @@ """ MAJOR = 1 -MINOR = 12 +MINOR = 13 PATCH = 0 VERSION = f"{MAJOR}.{MINOR}.{PATCH}" __version__ = VERSION diff --git a/pyproject.toml b/pyproject.toml index c8ef4cad8..de4c6a1ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "exasol-toolbox" -version = "1.12.0" +version = "1.13.0" requires-python = ">=3.9.2,<4.0" description = "Your one-stop solution for managing all standard tasks and core workflows of your Python project." authors = [