python-semantic-release 9.21.1__tar.gz → 9.21.2__tar.gz

{python_semantic_release-9.21.1/src/python_semantic_release.egg-info → python_semantic_release-9.21.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-semantic-release
-Version: 9.21.1
+Version: 9.21.2
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -17,17 +17,18 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: click~=8.0
+Requires-Dist: click~=8.1.0
 Requires-Dist: click-option-group~=0.5
 Requires-Dist: gitpython~=3.0
 Requires-Dist: requests~=2.25
 Requires-Dist: jinja2~=3.1
 Requires-Dist: python-gitlab<6.0.0,>=4.0.0
-Requires-Dist: tomlkit~=0.11
+Requires-Dist: tomlkit~=0.13.0
 Requires-Dist: dotty-dict~=1.3
 Requires-Dist: importlib-resources~=6.0
 Requires-Dist: pydantic~=2.0
@@ -36,6 +37,7 @@ Requires-Dist: shellingham~=1.5
 Requires-Dist: Deprecated~=1.2
 Provides-Extra: build
 Requires-Dist: build~=1.2; extra == "build"
+Requires-Dist: tomlkit~=0.13.0; extra == "build"
 Provides-Extra: docs
 Requires-Dist: Sphinx~=6.0; extra == "docs"
 Requires-Dist: sphinxcontrib-apidoc==0.5.0; extra == "docs"
@@ -44,7 +46,7 @@ Requires-Dist: furo~=2024.1; extra == "docs"
 Provides-Extra: test
 Requires-Dist: coverage[toml]~=7.0; extra == "test"
 Requires-Dist: filelock~=3.15; extra == "test"
-Requires-Dist: flatdict~=4.0; extra == "test"
+Requires-Dist: flatdict2~=4.0; extra == "test"
 Requires-Dist: freezegun~=1.5; extra == "test"
 Requires-Dist: pyyaml~=6.0; extra == "test"
 Requires-Dist: pytest~=8.3; extra == "test"

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/docs/automatic-releases/github-actions.rst

@@ -337,7 +337,7 @@ before the :ref:`version <cmd-version>` subcommand.
 
   .. code:: yaml
 
-    - uses: python-semantic-release/python-semantic-release@v9.21.0
+    - uses: python-semantic-release/python-semantic-release@v9.21.1
       with:
         root_options: "-vv --noop"
 
@@ -576,7 +576,7 @@ before the :ref:`publish <cmd-publish>` subcommand.
 
   .. code:: yaml
 
-    - uses: python-semantic-release/publish-action@v9.21.0
+    - uses: python-semantic-release/publish-action@v9.21.1
       with:
         root_options: "-vv --noop"
 
@@ -698,7 +698,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
@@ -728,14 +728,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@v9.21.0
+            uses: python-semantic-release/python-semantic-release@v9.21.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@v9.21.0
+            uses: python-semantic-release/publish-action@v9.21.1
             if: steps.release.outputs.released == 'true'
             with:
               github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -794,7 +794,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@v9.21.0
+    uses: python-semantic-release/python-semantic-release@v9.21.1
     with:
       github_token: ${{ secrets.GITHUB_TOKEN }}
       force: patch
@@ -844,14 +844,14 @@ Publish Action.
 
         - name: Release submodule 1
           id: release-submod-1
-          uses: python-semantic-release/python-semantic-release@v9.21.0
+          uses: python-semantic-release/python-semantic-release@v9.21.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@v9.21.0
+          uses: python-semantic-release/python-semantic-release@v9.21.1
           with:
             directory: ${{ env.SUBMODULE_2_DIR }}
             github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -863,7 +863,7 @@ Publish Action.
         # ------------------------------------------------------------------- #
 
         - name: Publish | Upload package 1 to GitHub Release Assets
-          uses: python-semantic-release/publish-action@v9.21.0
+          uses: python-semantic-release/publish-action@v9.21.1
           if: steps.release-submod-1.outputs.released == 'true'
           with:
             directory: ${{ env.SUBMODULE_1_DIR }}
@@ -871,7 +871,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@v9.21.0
+          uses: python-semantic-release/publish-action@v9.21.1
           if: steps.release-submod-2.outputs.released == 'true'
           with:
             directory: ${{ env.SUBMODULE_2_DIR }}

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/pyproject.toml

@@ -1,12 +1,10 @@
-# Ref: https://packaging.python.org/en/latest/specifications/declaring-project-metadata/
-# and https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html
 [build-system]
 requires = ["setuptools >= 75.3.0, < 81.0.0", "wheel ~= 0.42"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "9.21.1"
+version = "9.21.2"
 description = "Automatic Semantic Versioning for Python projects"
 requires-python = ">=3.8"
 license = { text = "MIT" }
@@ -19,17 +17,18 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
 readme = "README.rst"
 authors = [{ name = "Rolf Erik Lekang", email = "me@rolflekang.com" }]
 dependencies = [
-  "click ~= 8.0",
+  "click ~= 8.1.0",
   "click-option-group ~= 0.5",
   "gitpython ~= 3.0",
   "requests ~= 2.25",
   "jinja2 ~= 3.1",
   "python-gitlab >= 4.0.0, < 6.0.0",
-  "tomlkit ~= 0.11",
+  "tomlkit ~= 0.13.0",
   "dotty-dict ~= 1.3",
   "importlib-resources ~= 6.0",
   "pydantic ~= 2.0",
@@ -52,7 +51,8 @@ repository = "http://github.com/python-semantic-release/python-semantic-release.
 
 [project.optional-dependencies]
 build = [
-  "build ~= 1.2"
+  "build ~= 1.2",
+  "tomlkit ~= 0.13.0",
 ]
 docs = [
   "Sphinx ~= 6.0",
@@ -63,7 +63,7 @@ docs = [
 test = [
   "coverage[toml] ~= 7.0",
   "filelock ~= 3.15",
-  "flatdict ~= 4.0",
+  "flatdict2 ~= 4.0",
   "freezegun ~= 1.5",
   "pyyaml ~= 6.0",
   "pytest ~= 8.3",
@@ -91,6 +91,7 @@ mypy = [
 ]
 
 
+
 [tool.setuptools]
 include-package-data = true
 
@@ -197,7 +198,7 @@ module = "tests.*"
 disallow_untyped_defs = false
 
 [[tool.mypy.overrides]]
-module = "flatdict"
+module = "flatdict2"
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
@@ -433,7 +434,12 @@ mode = "update"
 template_dir = "config/release-templates"
 
 [tool.semantic_release.branches.main]
-match = "(main|master)"
+match = "^(main|master)$"
+prerelease = false
+prerelease_token = "rc"
+
+[tool.semantic_release.branches.maintenance]
+match = "^releases/v9"
 prerelease = false
 prerelease_token = "rc"
 

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2/src/python_semantic_release.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-semantic-release
-Version: 9.21.1
+Version: 9.21.2
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -17,17 +17,18 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: click~=8.0
+Requires-Dist: click~=8.1.0
 Requires-Dist: click-option-group~=0.5
 Requires-Dist: gitpython~=3.0
 Requires-Dist: requests~=2.25
 Requires-Dist: jinja2~=3.1
 Requires-Dist: python-gitlab<6.0.0,>=4.0.0
-Requires-Dist: tomlkit~=0.11
+Requires-Dist: tomlkit~=0.13.0
 Requires-Dist: dotty-dict~=1.3
 Requires-Dist: importlib-resources~=6.0
 Requires-Dist: pydantic~=2.0
@@ -36,6 +37,7 @@ Requires-Dist: shellingham~=1.5
 Requires-Dist: Deprecated~=1.2
 Provides-Extra: build
 Requires-Dist: build~=1.2; extra == "build"
+Requires-Dist: tomlkit~=0.13.0; extra == "build"
 Provides-Extra: docs
 Requires-Dist: Sphinx~=6.0; extra == "docs"
 Requires-Dist: sphinxcontrib-apidoc==0.5.0; extra == "docs"
@@ -44,7 +46,7 @@ Requires-Dist: furo~=2024.1; extra == "docs"
 Provides-Extra: test
 Requires-Dist: coverage[toml]~=7.0; extra == "test"
 Requires-Dist: filelock~=3.15; extra == "test"
-Requires-Dist: flatdict~=4.0; extra == "test"
+Requires-Dist: flatdict2~=4.0; extra == "test"
 Requires-Dist: freezegun~=1.5; extra == "test"
 Requires-Dist: pyyaml~=6.0; extra == "test"
 Requires-Dist: pytest~=8.3; extra == "test"

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/src/python_semantic_release.egg-info/requires.txt

@@ -1,10 +1,10 @@
-click~=8.0
+click~=8.1.0
 click-option-group~=0.5
 gitpython~=3.0
 requests~=2.25
 jinja2~=3.1
 python-gitlab<6.0.0,>=4.0.0
-tomlkit~=0.11
+tomlkit~=0.13.0
 dotty-dict~=1.3
 importlib-resources~=6.0
 pydantic~=2.0
@@ -14,6 +14,7 @@ Deprecated~=1.2
 
 [build]
 build~=1.2
+tomlkit~=0.13.0
 
 [dev]
 pre-commit~=3.5
@@ -35,7 +36,7 @@ types-pyyaml~=6.0
 [test]
 coverage[toml]~=7.0
 filelock~=3.15
-flatdict~=4.0
+flatdict2~=4.0
 freezegun~=1.5
 pyyaml~=6.0
 pytest~=8.3

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/src/semantic_release/helpers.py

@@ -10,7 +10,7 @@ from functools import lru_cache, reduce, wraps
 from pathlib import Path, PurePosixPath
 from re import IGNORECASE, compile as regexp
 from typing import TYPE_CHECKING, Any, Callable, NamedTuple, Sequence, TypeVar
-from urllib.parse import urlsplit
+from urllib.parse import urlsplit, urlunsplit
 
 if TYPE_CHECKING:  # pragma: no cover
     from re import Pattern
@@ -215,6 +215,16 @@ class ParsedGitUrl(NamedTuple):
     repo_name: str
 
 
+def _hide_credentials_in_url(url: str) -> str:
+    url_parts = urlsplit(url)
+
+    if not url_parts.scheme or "@" not in url_parts.netloc:
+        return url
+
+    _, _, host = url_parts.netloc.rpartition("@")
+    return urlunsplit(url_parts._replace(netloc=f"<credentials>@{host}"))
+
+
 @lru_cache(maxsize=512)
 def parse_git_url(url: str) -> ParsedGitUrl:
     """
@@ -242,7 +252,7 @@ def parse_git_url(url: str) -> ParsedGitUrl:
 
     Raises ValueError if the url can't be parsed.
     """
-    log.debug("Parsing git url %r", url)
+    log.debug("Parsing git url %r", _hide_credentials_in_url(url))
 
     # Normalizers are a list of tuples of (pattern, replacement)
     normalizers = [

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/git_flow/test_repo_1_channel.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/git_flow/test_repo_2_channels.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/git_flow/test_repo_3_channels.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/git_flow/test_repo_4_channels.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/github_flow/test_repo_1_channel.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/github_flow/test_repo_2_channels.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk_dual_version_support.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk_dual_version_support_w_prereleases.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk_w_prereleases.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from freezegun import freeze_time
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/e2e/cmd_version/test_version_build.py

@@ -10,7 +10,7 @@ from unittest import mock
 import pytest
 import shellingham
 import tomlkit
-from flatdict import FlatDict
+from flatdict2 import FlatDict
 from pytest_lazy_fixtures.lazy_fixture import lf as lazy_fixture
 
 from semantic_release.cli.commands.main import main

{python_semantic_release-9.21.1 → python_semantic_release-9.21.2}/tests/unit/semantic_release/test_helpers.py

@@ -1,4 +1,5 @@
 from typing import Iterable
+from unittest.mock import patch
 
 import pytest
 
@@ -120,6 +121,34 @@ def test_parse_valid_git_urls(url: str, expected: ParsedGitUrl):
     assert expected == parse_git_url(url)
 
 
+def test_parse_git_url_does_not_log_credentials():
+    """Test that credentials in git urls are masked before logging."""
+    username = "x-oauth-basic"
+    secret = "ghp_secret_token"
+    url = f"https://{username}:{secret}@github.example.com/owner/project.git"
+
+    expected_parsed_url = ParsedGitUrl(
+        "https",
+        f"{username}:{secret}@github.example.com",
+        "owner",
+        "project",
+    )
+
+    parse_git_url.cache_clear()
+    with patch("semantic_release.helpers.log") as mock_log:
+        actual_parsed_url = parse_git_url(url)
+
+        assert expected_parsed_url == actual_parsed_url
+        assert mock_log.debug.called
+
+        for debug_call in mock_log.debug.call_args_list:
+            args = debug_call[0]
+            formatted_msg = args[0] % args[1:] if len(args) > 1 else str(args[0])
+            assert secret not in formatted_msg
+            assert username not in formatted_msg
+            assert "<credentials>@github.example.com" in formatted_msg
+
+
 @pytest.mark.parametrize(
     "url",
     [