diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 85b471448..bc6ec4f7a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -35,7 +35,7 @@ mention the rationale here. ## PR Completion Checklist -- [ ] Reviewed & followed the [Contributor Guidelines](https://python-semantic-release.readthedocs.io/en/latest/contributing.html) +- [ ] Reviewed & followed the [Contributor Guidelines](https://python-semantic-release.readthedocs.io/en/stable/contributing/contributing_guide.html) - [ ] Changes Implemented & Validation pipeline succeeds diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 93e0957a4..86e6c522e 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -148,14 +148,14 @@ jobs: - name: Release | Python Semantic Release id: release - uses: python-semantic-release/python-semantic-release@6df5e876c8682fe0753ec2f8c81eb45547e52747 # v10.4.0 + uses: python-semantic-release/python-semantic-release@4d4cb0ab842247caea1963132c242c62aab1e4d5 # v10.4.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} verbosity: 1 build: false - name: Release | Add distribution artifacts to GitHub Release Assets - uses: python-semantic-release/publish-action@4681bbe581b99f950d7b6f14599870b6a117fdc1 # v10.4.0 + uses: python-semantic-release/publish-action@ae6462adc12bd3d1738070d784b65b5189b955a9 # v10.4.1 if: steps.release.outputs.released == 'true' with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 44289f651..89274fbbb 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -112,7 +112,7 @@ jobs: - name: Build | Build next version artifacts id: version - uses: python-semantic-release/python-semantic-release@6df5e876c8682fe0753ec2f8c81eb45547e52747 # v10.4.0 + uses: python-semantic-release/python-semantic-release@4d4cb0ab842247caea1963132c242c62aab1e4d5 # v10.4.1 with: github_token: "" verbosity: 1 diff --git a/.github/workflows/verify_upstream.sh b/.github/workflows/verify_upstream.sh index 3e8a38ac2..8444eba57 100644 --- a/.github/workflows/verify_upstream.sh +++ b/.github/workflows/verify_upstream.sh @@ -5,7 +5,7 @@ set -eu +o pipefail # Example output of `git status -sb`: # ## master...origin/master [behind 1] # M .github/workflows/verify_upstream.sh -UPSTREAM_BRANCH_NAME="$(git status -sb | head -n 1 | cut -d' ' -f2 | grep -E '\.{3}' | cut -d'.' -f4)" +UPSTREAM_BRANCH_NAME="$(git status -sb | head -n 1 | awk -F '\\.\\.\\.' '{print $2}' | cut -d ' ' -f1)" printf '%s\n' "Upstream branch name: $UPSTREAM_BRANCH_NAME" set -o pipefail diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 165ff864f..458f1a5ee 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,40 @@ CHANGELOG ========= +.. _changelog-v10.4.1: + +v10.4.1 (2025-09-13) +==================== + +🪲 Bug Fixes +------------ + +* **cmd-version**: Fix error where ``--no-tag`` is not respected, closes `#1304`_ (`PR#1329`_, + `b090fa2`_) + +📖 Documentation +---------------- + +* **CHANGELOG**: Update hyperlink in v10.4.0's additional info paragraph (`PR#1323`_, `98ef722`_) + +* **getting-started-guide**: Remove notice about lack of monorepo support, closes `#1326`_ + (`PR#1327`_, `3f21f3f`_) + +* **github-actions**: Fix recommended upstream detection script's upstream name parsing (`PR#1328`_, + `ccc91c0`_) + +.. _#1304: https://github.com/python-semantic-release/python-semantic-release/issues/1304 +.. _#1326: https://github.com/python-semantic-release/python-semantic-release/issues/1326 +.. _3f21f3f: https://github.com/python-semantic-release/python-semantic-release/commit/3f21f3fc47a0dacc11ec95feb2a23f8cf132e77b +.. _98ef722: https://github.com/python-semantic-release/python-semantic-release/commit/98ef722b65bd6a37492cf7ec8b0425800f719114 +.. _b090fa2: https://github.com/python-semantic-release/python-semantic-release/commit/b090fa2efc0ebfb40bdc572fea307d356af95a3f +.. _ccc91c0: https://github.com/python-semantic-release/python-semantic-release/commit/ccc91c09fab45358c7e52b42e6c0607c68c9d8f3 +.. _PR#1323: https://github.com/python-semantic-release/python-semantic-release/pull/1323 +.. _PR#1327: https://github.com/python-semantic-release/python-semantic-release/pull/1327 +.. _PR#1328: https://github.com/python-semantic-release/python-semantic-release/pull/1328 +.. _PR#1329: https://github.com/python-semantic-release/python-semantic-release/pull/1329 + + .. _changelog-v10.4.0: v10.4.0 (2025-09-08) diff --git a/docs/configuration/automatic-releases/github-actions.rst b/docs/configuration/automatic-releases/github-actions.rst index 57cd7b507..be8a8b480 100644 --- a/docs/configuration/automatic-releases/github-actions.rst +++ b/docs/configuration/automatic-releases/github-actions.rst @@ -903,7 +903,7 @@ to the GitHub Release Assets as well. run: | set +o pipefail - UPSTREAM_BRANCH_NAME="$(git status -sb | head -n 1 | cut -d' ' -f2 | grep -E '\.{3}' | cut -d'.' -f4)" + UPSTREAM_BRANCH_NAME="$(git status -sb | head -n 1 | awk -F '\\.\\.\\.' '{print $2}' | cut -d ' ' -f1)" printf '%s\n' "Upstream branch name: $UPSTREAM_BRANCH_NAME" set -o pipefail @@ -933,14 +933,14 @@ to the GitHub Release Assets as well. - name: Action | Semantic Version Release id: release # Adjust tag with desired version if applicable. - uses: python-semantic-release/python-semantic-release@v10.4.0 + uses: python-semantic-release/python-semantic-release@v10.4.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} git_committer_name: "github-actions" git_committer_email: "actions@users.noreply.github.com" - name: Publish | Upload to GitHub Release Assets - uses: python-semantic-release/publish-action@v10.4.0 + uses: python-semantic-release/publish-action@v10.4.1 if: steps.release.outputs.released == 'true' with: github_token: ${{ secrets.GITHUB_TOKEN }} @@ -1039,7 +1039,7 @@ The equivalent GitHub Action configuration would be: - name: Action | Semantic Version Release # Adjust tag with desired version if applicable. - uses: python-semantic-release/python-semantic-release@v10.4.0 + uses: python-semantic-release/python-semantic-release@v10.4.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} force: patch @@ -1098,14 +1098,14 @@ Publish Action. - name: Release submodule 1 id: release-submod-1 - uses: python-semantic-release/python-semantic-release@v10.4.0 + uses: python-semantic-release/python-semantic-release@v10.4.1 with: directory: ${{ env.SUBMODULE_1_DIR }} github_token: ${{ secrets.GITHUB_TOKEN }} - name: Release submodule 2 id: release-submod-2 - uses: python-semantic-release/python-semantic-release@v10.4.0 + uses: python-semantic-release/python-semantic-release@v10.4.1 with: directory: ${{ env.SUBMODULE_2_DIR }} github_token: ${{ secrets.GITHUB_TOKEN }} @@ -1117,7 +1117,7 @@ Publish Action. # ------------------------------------------------------------------- # - name: Publish | Upload package 1 to GitHub Release Assets - uses: python-semantic-release/publish-action@v10.4.0 + uses: python-semantic-release/publish-action@v10.4.1 if: steps.release-submod-1.outputs.released == 'true' with: directory: ${{ env.SUBMODULE_1_DIR }} @@ -1125,7 +1125,7 @@ Publish Action. tag: ${{ steps.release-submod-1.outputs.tag }} - name: Publish | Upload package 2 to GitHub Release Assets - uses: python-semantic-release/publish-action@v10.4.0 + uses: python-semantic-release/publish-action@v10.4.1 if: steps.release-submod-2.outputs.released == 'true' with: directory: ${{ env.SUBMODULE_2_DIR }} diff --git a/pyproject.toml b/pyproject.toml index 22640474d..e5629a06e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "python-semantic-release" -version = "10.4.0" +version = "10.4.1" description = "Automatic Semantic Versioning for Python projects" requires-python = "~= 3.8" license = { text = "MIT" } @@ -70,7 +70,7 @@ test = [ "pytest-clarity ~= 1.0", "pytest-cov >= 5.0.0, < 7.0.0", "pytest-env ~= 1.0", - "pytest-lazy-fixtures ~= 1.1.1", + "pytest-lazy-fixtures ~= 1.3.4", "pytest-mock ~= 3.0", "pytest-order ~= 1.3", "pytest-pretty ~= 1.2", @@ -79,7 +79,7 @@ test = [ "requests-mock ~= 1.10", ] dev = [ - "pre-commit ~= 3.5", + "pre-commit ~= 4.3", "tox ~= 4.11", "ruff == 0.6.1" ] diff --git a/src/gh_action/requirements.txt b/src/gh_action/requirements.txt index e35c59aae..c624d98e8 100644 --- a/src/gh_action/requirements.txt +++ b/src/gh_action/requirements.txt @@ -1 +1 @@ -python-semantic-release == 10.4.0 +python-semantic-release == 10.4.1 diff --git a/src/semantic_release/cli/commands/version.py b/src/semantic_release/cli/commands/version.py index 27b86be79..717f55278 100644 --- a/src/semantic_release/cli/commands/version.py +++ b/src/semantic_release/cli/commands/version.py @@ -710,7 +710,7 @@ def version( # noqa: C901 # are disabled, and the changelog generation is disabled or it's not # modified, then the HEAD commit will be tagged as a release commit # despite not being made by PSR - if commit_changes or create_tag: + if create_tag: project.git_tag( tag_name=new_version.as_tag(), message=new_version.as_tag(),