python-semantic-release 9.3.0__tar.gz → 9.4.0__tar.gz

{python-semantic-release-9.3.0/python_semantic_release.egg-info → python-semantic-release-9.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.3.0
+Version: 9.4.0
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -20,43 +20,43 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: click<9,>=8
+Requires-Dist: click~=8.0
 Requires-Dist: click-option-group~=0.5
-Requires-Dist: gitpython<4,>=3.0.8
-Requires-Dist: requests<3,>=2.25
-Requires-Dist: jinja2<4,>=3.1.2
-Requires-Dist: python-gitlab<5,>=2
+Requires-Dist: gitpython~=3.0
+Requires-Dist: requests~=2.25
+Requires-Dist: jinja2~=3.1
+Requires-Dist: python-gitlab~=4.0
 Requires-Dist: tomlkit~=0.11
-Requires-Dist: dotty-dict<2,>=1.3.0
-Requires-Dist: importlib-resources<7,>=5.7
-Requires-Dist: pydantic<3,>=2
-Requires-Dist: rich>=12.5.1
-Requires-Dist: shellingham>=1.5.0.post1
+Requires-Dist: dotty-dict~=1.3
+Requires-Dist: importlib-resources~=6.0
+Requires-Dist: pydantic~=2.0
+Requires-Dist: rich~=12.5
+Requires-Dist: shellingham~=1.5
 Provides-Extra: docs
-Requires-Dist: Sphinx<=6.0.0; extra == "docs"
-Requires-Dist: sphinxcontrib-apidoc==0.3.0; extra == "docs"
-Requires-Dist: sphinx-autobuild==2021.03.14; extra == "docs"
-Requires-Dist: furo>=2023.3.27; extra == "docs"
+Requires-Dist: Sphinx~=6.0; extra == "docs"
+Requires-Dist: sphinxcontrib-apidoc==0.5.0; extra == "docs"
+Requires-Dist: sphinx-autobuild==2024.2.4; extra == "docs"
+Requires-Dist: furo~=2023.3; extra == "docs"
 Provides-Extra: test
-Requires-Dist: coverage[toml]<8,>=6; extra == "test"
-Requires-Dist: pytest<8,>=7; extra == "test"
+Requires-Dist: coverage[toml]~=7.0; extra == "test"
+Requires-Dist: pytest~=7.0; extra == "test"
 Requires-Dist: pytest-env~=1.0; extra == "test"
-Requires-Dist: pytest-xdist<4,>=2; extra == "test"
-Requires-Dist: pytest-mock<4,>=3; extra == "test"
+Requires-Dist: pytest-xdist~=3.0; extra == "test"
+Requires-Dist: pytest-mock~=3.0; extra == "test"
 Requires-Dist: pytest-lazy-fixture~=0.6.3; extra == "test"
-Requires-Dist: pytest-cov<5,>=4; extra == "test"
-Requires-Dist: pytest-pretty<2,>=1.2.0; extra == "test"
-Requires-Dist: pytest-clarity>=1.0.1; extra == "test"
-Requires-Dist: responses==0.23.3; extra == "test"
-Requires-Dist: requests-mock<2,>=1.10.0; extra == "test"
-Requires-Dist: types-pytest-lazy-fixture>=0.6.3.3; extra == "test"
+Requires-Dist: pytest-cov~=5.0; extra == "test"
+Requires-Dist: pytest-pretty~=1.2; extra == "test"
+Requires-Dist: pytest-clarity~=1.0; extra == "test"
+Requires-Dist: responses~=0.25.0; extra == "test"
+Requires-Dist: requests-mock~=1.10; extra == "test"
+Requires-Dist: types-pytest-lazy-fixture~=0.6.3; extra == "test"
 Provides-Extra: dev
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: tox; extra == "dev"
-Requires-Dist: ruff==0.3.2; extra == "dev"
+Requires-Dist: pre-commit~=3.5; extra == "dev"
+Requires-Dist: tox~=4.11; extra == "dev"
+Requires-Dist: ruff==0.3.4; extra == "dev"
 Provides-Extra: mypy
-Requires-Dist: mypy; extra == "mypy"
-Requires-Dist: types-requests; extra == "mypy"
+Requires-Dist: mypy==1.8.0; extra == "mypy"
+Requires-Dist: types-requests~=2.31.0; extra == "mypy"
 
 Python Semantic Release
 ***********************

{python-semantic-release-9.3.0 → python-semantic-release-9.4.0}/pyproject.toml

@@ -1,12 +1,12 @@
 # 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>=61.0.0", "wheel"]
+requires = ["setuptools ~= 69.0", "wheel ~= 0.42"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "9.3.0"
+version = "9.4.0"
 description = "Automatic Semantic Versioning for Python projects"
 requires-python = ">=3.8"
 license = { text = "MIT" }
@@ -22,18 +22,18 @@ classifiers = [
 readme = "README.rst"
 authors = [{ name = "Rolf Erik Lekang", email = "me@rolflekang.com" }]
 dependencies = [
-  "click>=8,<9",
-  "click-option-group~=0.5",
-  "gitpython>=3.0.8,<4",
-  "requests>=2.25,<3",
-  "jinja2>=3.1.2,<4",
-  "python-gitlab>=2,<5",
-  "tomlkit~=0.11",
-  "dotty-dict>=1.3.0,<2",
-  "importlib-resources>=5.7,<7",
-  "pydantic>=2,<3",
-  "rich>=12.5.1",
-  "shellingham>=1.5.0.post1",
+  "click ~= 8.0",
+  "click-option-group ~= 0.5",
+  "gitpython ~= 3.0",
+  "requests ~= 2.25",
+  "jinja2 ~= 3.1",
+  "python-gitlab ~= 4.0",
+  "tomlkit ~= 0.11",
+  "dotty-dict ~= 1.3",
+  "importlib-resources ~= 6.0",
+  "pydantic ~= 2.0",
+  "rich ~= 12.5",
+  "shellingham ~= 1.5",
 ]
 
 [project.scripts]
@@ -49,27 +49,34 @@ repository = "http://github.com/python-semantic-release/python-semantic-release.
 
 [project.optional-dependencies]
 docs = [
-  "Sphinx<=6.0.0",
-  "sphinxcontrib-apidoc==0.3.0",
-  "sphinx-autobuild==2021.03.14",
-  "furo>=2023.3.27",
+  "Sphinx ~= 6.0",
+  "sphinxcontrib-apidoc == 0.5.0",
+  "sphinx-autobuild == 2024.2.4",
+  "furo ~= 2023.3",
 ]
 test = [
-  "coverage[toml]>=6,<8",
-  "pytest>=7,<8",
-  "pytest-env~=1.0",
-  "pytest-xdist>=2,<4",
-  "pytest-mock>=3,<4",
-  "pytest-lazy-fixture~=0.6.3",
-  "pytest-cov>=4,<5",
-  "pytest-pretty>=1.2.0,<2",
-  "pytest-clarity>=1.0.1",
-  "responses==0.23.3",
-  "requests-mock>=1.10.0,<2",
-  "types-pytest-lazy-fixture>=0.6.3.3",
+  "coverage[toml] ~= 7.0",
+  "pytest ~= 7.0",
+  "pytest-env ~= 1.0",
+  "pytest-xdist ~= 3.0",
+  "pytest-mock ~= 3.0",
+  "pytest-lazy-fixture ~= 0.6.3",
+  "pytest-cov ~= 5.0",
+  "pytest-pretty ~= 1.2",
+  "pytest-clarity ~= 1.0",
+  "responses ~= 0.25.0",
+  "requests-mock ~= 1.10",
+  "types-pytest-lazy-fixture ~= 0.6.3",
+]
+dev = [
+  "pre-commit ~= 3.5",
+  "tox ~= 4.11",
+  "ruff == 0.3.4"
+]
+mypy = [
+  "mypy == 1.8.0",
+  "types-requests ~= 2.31.0"
 ]
-dev = ["pre-commit", "tox", "ruff==0.3.2"]
-mypy = ["mypy", "types-requests"]
 
 [tool.pytest.ini_options]
 env = [

{python-semantic-release-9.3.0 → python-semantic-release-9.4.0/python_semantic_release.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.3.0
+Version: 9.4.0
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -20,43 +20,43 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: click<9,>=8
+Requires-Dist: click~=8.0
 Requires-Dist: click-option-group~=0.5
-Requires-Dist: gitpython<4,>=3.0.8
-Requires-Dist: requests<3,>=2.25
-Requires-Dist: jinja2<4,>=3.1.2
-Requires-Dist: python-gitlab<5,>=2
+Requires-Dist: gitpython~=3.0
+Requires-Dist: requests~=2.25
+Requires-Dist: jinja2~=3.1
+Requires-Dist: python-gitlab~=4.0
 Requires-Dist: tomlkit~=0.11
-Requires-Dist: dotty-dict<2,>=1.3.0
-Requires-Dist: importlib-resources<7,>=5.7
-Requires-Dist: pydantic<3,>=2
-Requires-Dist: rich>=12.5.1
-Requires-Dist: shellingham>=1.5.0.post1
+Requires-Dist: dotty-dict~=1.3
+Requires-Dist: importlib-resources~=6.0
+Requires-Dist: pydantic~=2.0
+Requires-Dist: rich~=12.5
+Requires-Dist: shellingham~=1.5
 Provides-Extra: docs
-Requires-Dist: Sphinx<=6.0.0; extra == "docs"
-Requires-Dist: sphinxcontrib-apidoc==0.3.0; extra == "docs"
-Requires-Dist: sphinx-autobuild==2021.03.14; extra == "docs"
-Requires-Dist: furo>=2023.3.27; extra == "docs"
+Requires-Dist: Sphinx~=6.0; extra == "docs"
+Requires-Dist: sphinxcontrib-apidoc==0.5.0; extra == "docs"
+Requires-Dist: sphinx-autobuild==2024.2.4; extra == "docs"
+Requires-Dist: furo~=2023.3; extra == "docs"
 Provides-Extra: test
-Requires-Dist: coverage[toml]<8,>=6; extra == "test"
-Requires-Dist: pytest<8,>=7; extra == "test"
+Requires-Dist: coverage[toml]~=7.0; extra == "test"
+Requires-Dist: pytest~=7.0; extra == "test"
 Requires-Dist: pytest-env~=1.0; extra == "test"
-Requires-Dist: pytest-xdist<4,>=2; extra == "test"
-Requires-Dist: pytest-mock<4,>=3; extra == "test"
+Requires-Dist: pytest-xdist~=3.0; extra == "test"
+Requires-Dist: pytest-mock~=3.0; extra == "test"
 Requires-Dist: pytest-lazy-fixture~=0.6.3; extra == "test"
-Requires-Dist: pytest-cov<5,>=4; extra == "test"
-Requires-Dist: pytest-pretty<2,>=1.2.0; extra == "test"
-Requires-Dist: pytest-clarity>=1.0.1; extra == "test"
-Requires-Dist: responses==0.23.3; extra == "test"
-Requires-Dist: requests-mock<2,>=1.10.0; extra == "test"
-Requires-Dist: types-pytest-lazy-fixture>=0.6.3.3; extra == "test"
+Requires-Dist: pytest-cov~=5.0; extra == "test"
+Requires-Dist: pytest-pretty~=1.2; extra == "test"
+Requires-Dist: pytest-clarity~=1.0; extra == "test"
+Requires-Dist: responses~=0.25.0; extra == "test"
+Requires-Dist: requests-mock~=1.10; extra == "test"
+Requires-Dist: types-pytest-lazy-fixture~=0.6.3; extra == "test"
 Provides-Extra: dev
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: tox; extra == "dev"
-Requires-Dist: ruff==0.3.2; extra == "dev"
+Requires-Dist: pre-commit~=3.5; extra == "dev"
+Requires-Dist: tox~=4.11; extra == "dev"
+Requires-Dist: ruff==0.3.4; extra == "dev"
 Provides-Extra: mypy
-Requires-Dist: mypy; extra == "mypy"
-Requires-Dist: types-requests; extra == "mypy"
+Requires-Dist: mypy==1.8.0; extra == "mypy"
+Requires-Dist: types-requests~=2.31.0; extra == "mypy"
 
 Python Semantic Release
 ***********************

python-semantic-release-9.4.0/python_semantic_release.egg-info/requires.txt

@@ -0,0 +1,41 @@
+click~=8.0
+click-option-group~=0.5
+gitpython~=3.0
+requests~=2.25
+jinja2~=3.1
+python-gitlab~=4.0
+tomlkit~=0.11
+dotty-dict~=1.3
+importlib-resources~=6.0
+pydantic~=2.0
+rich~=12.5
+shellingham~=1.5
+
+[dev]
+pre-commit~=3.5
+tox~=4.11
+ruff==0.3.4
+
+[docs]
+Sphinx~=6.0
+sphinxcontrib-apidoc==0.5.0
+sphinx-autobuild==2024.2.4
+furo~=2023.3
+
+[mypy]
+mypy==1.8.0
+types-requests~=2.31.0
+
+[test]
+coverage[toml]~=7.0
+pytest~=7.0
+pytest-env~=1.0
+pytest-xdist~=3.0
+pytest-mock~=3.0
+pytest-lazy-fixture~=0.6.3
+pytest-cov~=5.0
+pytest-pretty~=1.2
+pytest-clarity~=1.0
+responses~=0.25.0
+requests-mock~=1.10
+types-pytest-lazy-fixture~=0.6.3

{python-semantic-release-9.3.0 → python-semantic-release-9.4.0}/semantic_release/__init__.py

@@ -24,7 +24,7 @@ from semantic_release.version import (
     tags_and_versions,
 )
 
-__version__ = "9.3.0"
+__version__ = "9.4.0"
 
 
 def setup_hook(argv: list[str]) -> None:

{python-semantic-release-9.3.0 → python-semantic-release-9.4.0}/semantic_release/cli/commands/version.py

@@ -585,12 +585,17 @@ def version(  # noqa: C901
                 indented(
                     f"""
                     would have run:
-                        git push --tags {runtime.masker.mask(remote_url)} {active_branch}
+                        git push {runtime.masker.mask(remote_url)} tag {new_version.as_tag()}
                     """  # noqa: E501
                 )
             )
         elif create_tag:
-            repo.git.push("--tags", remote_url, active_branch)
+            # push specific tag refspec (that we made) to remote
+            # ---------------
+            # Resolves issue #803 where a tag that already existed was pushed and caused
+            # a failure. Its not clear why there was an incorrect tag (likely user error change)
+            # but we will avoid possibly pushing an separate tag that we didn't create.
+            repo.git.push(remote_url, "tag", new_version.as_tag())
 
     gha_output.released = True
 

{python-semantic-release-9.3.0 → python-semantic-release-9.4.0}/semantic_release/errors.py

@@ -31,3 +31,10 @@ class CommitParseError(SemanticReleaseBaseError):
     Raised when a commit cannot be parsed by a commit parser. Custom commit parsers
     should also raise this Exception
     """
+
+
+class MissingMergeBaseError(SemanticReleaseBaseError):
+    """
+    Raised when the merge base cannot be found with the current history. Generally
+    because of a shallow git clone.
+    """

{python-semantic-release-9.3.0 → python-semantic-release-9.4.0}/semantic_release/hvcs/gitea.py

@@ -8,6 +8,7 @@ import mimetypes
 import os
 
 from requests import HTTPError
+from urllib3.util.url import Url, parse_url
 
 from semantic_release.helpers import logged_function
 from semantic_release.hvcs._base import HvcsBase
@@ -49,13 +50,32 @@ class Gitea(HvcsBase):
     ) -> None:
         self._remote_url = remote_url
 
-        self.hvcs_domain = hvcs_domain or os.getenv(
-            "GITEA_SERVER_URL", self.DEFAULT_DOMAIN
-        ).replace("https://", "")
+        domain_url = parse_url(
+            hvcs_domain or os.getenv("GITEA_SERVER_URL", "") or self.DEFAULT_DOMAIN
+        )
+
+        # Strip any scheme, query or fragment from the domain
+        self.hvcs_domain = Url(
+            host=domain_url.host, port=domain_url.port, path=domain_url.path
+        ).url.rstrip("/")
+
+        api_domain_parts = parse_url(
+            hvcs_api_domain
+            or os.getenv("GITEA_API_URL", "")
+            or Url(
+                # infer from Domain url and append the default api path
+                scheme=domain_url.scheme,
+                host=self.hvcs_domain,
+                path=self.DEFAULT_API_PATH,
+            ).url
+        )
 
-        self.hvcs_api_domain = hvcs_api_domain or os.getenv(
-            "GITEA_API_URL", self.DEFAULT_API_DOMAIN
-        ).replace("https://", "")
+        # Strip any scheme, query or fragment from the api domain
+        self.hvcs_api_domain = Url(
+            host=api_domain_parts.host,
+            port=api_domain_parts.port,
+            path=api_domain_parts.path,
+        ).url.rstrip("/")
 
         self.api_url = f"https://{self.hvcs_api_domain}"
 

{python-semantic-release-9.3.0 → python-semantic-release-9.4.0}/semantic_release/version/algorithm.py

@@ -4,12 +4,10 @@ import logging
 from queue import Queue
 from typing import TYPE_CHECKING, Iterable
 
-from semantic_release.commit_parser import (
-    ParsedCommit,
-)
+from semantic_release.commit_parser import ParsedCommit
 from semantic_release.const import DEFAULT_VERSION
 from semantic_release.enums import LevelBump
-from semantic_release.errors import InvalidVersion
+from semantic_release.errors import InvalidVersion, MissingMergeBaseError
 from semantic_release.version.version import Version
 
 if TYPE_CHECKING:
@@ -278,9 +276,9 @@ def next_version(
     """
     # Step 1. All tags, sorted descending by semver ordering rules
     all_git_tags_as_versions = tags_and_versions(repo.tags, translator)
-    all_full_release_tags_and_versions = [
-        (t, v) for t, v in all_git_tags_as_versions if not v.is_prerelease
-    ]
+    all_full_release_tags_and_versions = list(
+        filter(lambda t_v: not t_v[1].is_prerelease, all_git_tags_as_versions)
+    )
     log.info(
         "Found %s full releases (excluding prereleases)",
         len(all_full_release_tags_and_versions),
@@ -291,30 +289,59 @@ def next_version(
         iter(all_full_release_tags_and_versions),
         (None, translator.from_string(DEFAULT_VERSION)),
     )
-    if latest_full_release_tag is None:
-        # Workaround - we can safely scan the extra commits on this
-        # branch if it's never been released, but we have no other
-        # guarantees that other branches exist
-        log.info(
-            "No full releases have been made yet, the default version to use is %s",
-            latest_full_release_version,
+
+    # we can safely scan the extra commits on this
+    # branch if it's never been released, but we have no other
+    # guarantees that other branches exist
+    # Note the merge_base might be on our current branch, it's not
+    # necessarily the merge base of the current branch with `main`
+    other_ref = (
+        repo.active_branch
+        if latest_full_release_tag is None
+        else latest_full_release_tag.name
+    )
+
+    # Conditional log message to inform what was chosen as the comparison point
+    # to find the merge base of the current branch with the latest full release
+    log_msg = (
+        str.join(
+            ", ",
+            [
+                "No full releases have been made yet",
+                f"the default version to use is {latest_full_release_version}",
+            ],
         )
-        merge_bases = repo.merge_base(repo.active_branch, repo.active_branch)
-    else:
-        # Note the merge_base might be on our current branch, it's not
-        # necessarily the merge base of the current branch with `main`
-        log.info(
-            "The last full release was %s, tagged as %r",
-            latest_full_release_version,
-            latest_full_release_tag,
+        if latest_full_release_tag is None
+        else str.join(
+            ", ",
+            [
+                f"The last full release was {latest_full_release_version}",
+                f"tagged as {latest_full_release_tag!r}",
+            ],
         )
-        merge_bases = repo.merge_base(latest_full_release_tag.name, repo.active_branch)
+    )
+
+    log.info(log_msg)
+    merge_bases = repo.merge_base(other_ref, repo.active_branch)
+
+    if len(merge_bases) < 1:
+        raise MissingMergeBaseError(
+            f"Unable to find merge-base between {other_ref} and {repo.active_branch.name}"
+        )
+
     if len(merge_bases) > 1:
         raise NotImplementedError(
-            "This branch has more than one merge-base with the "
-            "latest version, which is not yet supported"
+            str.join(
+                " ",
+                [
+                    "This branch has more than one merge-base with the",
+                    "latest version, which is not yet supported",
+                ],
+            )
         )
+
     merge_base = merge_bases[0]
+
     if merge_base is None:
         str_tag_name = (
             "None" if latest_full_release_tag is None else latest_full_release_tag.name
@@ -350,6 +377,23 @@ def next_version(
         tag_format=translator.tag_format,
     )
 
+    # We only include pre-releases here if doing a prerelease.
+    # If it's not a prerelease, we need to include commits back
+    # to the last full version in consideration for what kind of
+    # bump to produce. However if we're doing a prerelease, we can
+    # include prereleases here to potentially consider a smaller portion
+    # of history (from a prerelease since the last full release, onwards)
+
+    # Note that a side-effect of this is, if at some point the configuration
+    # for a particular branch pattern changes w.r.t. prerelease=True/False,
+    # the new kind of version will be produced from the commits already
+    # included in a prerelease since the last full release on the branch
+    tag_sha_2_version_lookup = {
+        tag.commit.hexsha: (tag, version)
+        for tag, version in all_git_tags_as_versions
+        if prerelease or not version.is_prerelease
+    }
+
     # N.B. these should be sorted so long as we iterate the commits in reverse order
     for commit in commits_since_last_full_release:
         parse_result = commit_parser.parse(commit)
@@ -360,44 +404,24 @@ def next_version(
             )
             parsed_levels.add(parse_result.bump)
 
-        # We only include pre-releases here if doing a prerelease.
-        # If it's not a prerelease, we need to include commits back
-        # to the last full version in consideration for what kind of
-        # bump to produce. However if we're doing a prerelease, we can
-        # include prereleases here to potentially consider a smaller portion
-        # of history (from a prerelease since the last full release, onwards)
-
-        # Note that a side-effect of this is, if at some point the configuration
-        # for a particular branch pattern changes w.r.t. prerelease=True/False,
-        # the new kind of version will be produced from the commits already
-        # included in a prerelease since the last full release on the branch
-        for tag, version in (
-            (tag, version)
-            for tag, version in all_git_tags_as_versions
-            if prerelease or not version.is_prerelease
-        ):
-            log.debug(
-                "testing if tag %r (%s) matches commit %s",
-                tag.name,
-                tag.commit.hexsha,
-                commit.hexsha,
-            )
-            if tag.commit == commit:
-                latest_version = version
-                log.debug(
-                    "tag %r (%s) matches commit %s. the latest version is %s",
-                    tag.name,
-                    tag.commit.hexsha,
-                    commit.hexsha,
-                    latest_version,
-                )
-                break
-        else:
+        log.debug("checking if commit %s matches any tags", commit.hexsha)
+        t_v = tag_sha_2_version_lookup.get(commit.hexsha, None)
+
+        if t_v is None:
             # If we haven't found the latest prerelease on the branch,
-            # keep the outer loop going to look for it
+            # keep the loop going to look for it
             log.debug("no tags correspond to commit %s", commit.hexsha)
             continue
-        # If we found it in the inner loop, break the outer loop too
+
+        # Unpack the tuple
+        tag, latest_version = t_v
+        log.debug(
+            "tag %r (%s) matches commit %s. the latest version is %s",
+            tag.name,
+            tag.commit.hexsha,
+            commit.hexsha,
+            latest_version,
+        )
         break
 
     log.debug(

{python-semantic-release-9.3.0 → python-semantic-release-9.4.0}/tests/unit/semantic_release/hvcs/test_gitea.py

@@ -29,9 +29,15 @@ def default_gitea_client():
 
 
 @pytest.mark.parametrize(
-    (
-        "patched_os_environ, hvcs_domain, hvcs_api_domain, "
-        "expected_hvcs_domain, expected_hvcs_api_domain"
+    str.join(
+        ", ",
+        [
+            "patched_os_environ",
+            "hvcs_domain",
+            "hvcs_api_domain",
+            "expected_hvcs_domain",
+            "expected_hvcs_api_domain",
+        ],
     ),
     [
         ({}, None, None, Gitea.DEFAULT_DOMAIN, Gitea.DEFAULT_API_DOMAIN),
@@ -39,29 +45,29 @@ def default_gitea_client():
             {"GITEA_SERVER_URL": "https://special.custom.server/vcs/"},
             None,
             None,
-            "special.custom.server/vcs/",
-            Gitea.DEFAULT_API_DOMAIN,
+            "special.custom.server/vcs",
+            "special.custom.server/vcs/api/v1",
         ),
         (
             {"GITEA_API_URL": "https://api.special.custom.server/"},
             None,
             None,
             Gitea.DEFAULT_DOMAIN,
-            "api.special.custom.server/",
+            "api.special.custom.server",
         ),
         (
             {"GITEA_SERVER_URL": "https://special.custom.server/vcs/"},
             "https://example.com",
             None,
-            "https://example.com",
-            Gitea.DEFAULT_API_DOMAIN,
+            "example.com",
+            "example.com/api/v1",
         ),
         (
             {"GITEA_API_URL": "https://api.special.custom.server/"},
             None,
             "https://api.example.com",
             Gitea.DEFAULT_DOMAIN,
-            "https://api.example.com",
+            "api.example.com",
         ),
     ],
 )
@@ -90,11 +96,11 @@ def test_gitea_client_init(
             token=token,
         )
 
-        assert client.hvcs_domain == expected_hvcs_domain
-        assert client.hvcs_api_domain == expected_hvcs_api_domain
-        assert client.api_url == f"https://{client.hvcs_api_domain}"
-        assert client.token == token
-        assert client._remote_url == remote_url
+        assert expected_hvcs_domain == client.hvcs_domain
+        assert expected_hvcs_api_domain == client.hvcs_api_domain
+        assert f"https://{expected_hvcs_api_domain}" == client.api_url
+        assert token == client.token
+        assert remote_url == client._remote_url
         assert hasattr(client, "session")
         assert isinstance(getattr(client, "session", None), Session)