python-semantic-release 8.4.0__tar.gz → 8.5.1__tar.gz

{python-semantic-release-8.4.0/python_semantic_release.egg-info → python-semantic-release-8.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 8.4.0
+Version: 8.5.1
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT

{python-semantic-release-8.4.0 → python-semantic-release-8.5.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "8.4.0"
+version = "8.5.1"
 description = "Automatic Semantic Versioning for Python projects"
 requires-python = ">=3.7"
 license = { text = "MIT" }

{python-semantic-release-8.4.0 → python-semantic-release-8.5.1/python_semantic_release.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 8.4.0
+Version: 8.5.1
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT

{python-semantic-release-8.4.0 → python-semantic-release-8.5.1}/semantic_release/__init__.py

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

{python-semantic-release-8.4.0 → python-semantic-release-8.5.1}/semantic_release/changelog/template.py

@@ -81,22 +81,28 @@ def recursive_render(
 ) -> list[str]:
     rendered_paths: list[str] = []
     for root, file in (
-        (root, file)
+        (Path(root), file)
         for root, _, files in os.walk(template_dir)
         for file in files
-        if not any(elem.startswith(".") for elem in root.split(os.sep))
+        # we slice relpath.parts[1:] to allow the top-level
+        # template folder to have a dot prefix.
+        # e.g. to permit ".github/psr-templates" to contain the templates,
+        # rather than enforcing a top-level, non-hidden directory
+        if not any(
+            elem.startswith(".")
+            for elem in Path(root).relative_to(template_dir).parts[1:]
+        )
         and not file.startswith(".")
     ):
-        src_path = Path(root)
-        output_path = (_root_dir / src_path.relative_to(template_dir)).resolve()
-        log.info("Rendering templates from %s to %s", src_path, output_path)
-        os.makedirs(str(output_path), exist_ok=True)
+        output_path = (_root_dir / root.relative_to(template_dir)).resolve()
+        log.info("Rendering templates from %s to %s", root, output_path)
+        output_path.mkdir(parents=True, exist_ok=True)
         if file.endswith(".j2"):
             # We know the file ends with .j2 by the filter in the for-loop
             output_filename = file[:-3]
             # Strip off the template directory from the front of the root path -
             # that's the output location relative to the repo root
-            src_file_path = str((src_path / file).relative_to(template_dir))
+            src_file_path = str((root / file).relative_to(template_dir))
             output_file_path = str((output_path / output_filename).resolve())
 
             log.debug("rendering %s to %s", src_file_path, output_file_path)
@@ -107,7 +113,7 @@ def recursive_render(
 
             rendered_paths.append(output_file_path)
         else:
-            src_file = str((src_path / file).resolve())
+            src_file = str((root / file).resolve())
             target_file = str((output_path / file).resolve())
             log.debug(
                 "source file %s is not a template, copying to %s", src_file, target_file

{python-semantic-release-8.4.0 → python-semantic-release-8.5.1}/semantic_release/cli/commands/version.py

@@ -9,6 +9,7 @@ from typing import TYPE_CHECKING, ContextManager, Iterable
 
 import click
 import shellingham  # type: ignore[import]
+from git.exc import GitCommandError
 
 from semantic_release.changelog import ReleaseHistory, environment, recursive_render
 from semantic_release.changelog.context import make_changelog_context
@@ -243,15 +244,13 @@ def version(  # noqa: C901
         translator.prerelease_token = prerelease_token
 
     # Only push if we're committing changes
-    if push_changes and not commit_changes:
-        if not create_tag:
-            log.info("changes will not be pushed because --no-commit disables pushing")
-            push_changes &= commit_changes
+    if push_changes and not commit_changes and not create_tag:
+        log.info("changes will not be pushed because --no-commit disables pushing")
+        push_changes &= commit_changes
     # Only push if we're creating a tag
-    if push_changes and not create_tag:
-        if not commit_changes:
-            log.info("new tag will not be pushed because --no-tag disables pushing")
-            push_changes &= create_tag
+    if push_changes and not create_tag and not commit_changes:
+        log.info("new tag will not be pushed because --no-tag disables pushing")
+        push_changes &= create_tag
     # Only make a release if we're pushing the changes
     if make_vcs_release and not push_changes:
         log.info("No vcs release will be created because pushing changes is disabled")
@@ -371,7 +370,15 @@ def version(  # noqa: C901
         )
 
     elif commit_changes:
-        repo.git.add(all_paths_to_add)
+        # TODO: in future this loop should be 1 line:
+        # repo.index.add(all_paths_to_add, force=False)
+        # but since 'force' is deliberally ineffective (as in docstring) in gitpython 3.1.18
+        # we have to do manually add each filepath, and catch the exception if it is an ignored file
+        for updated_path in all_paths_to_add:
+            try:
+                repo.git.add(updated_path)
+            except GitCommandError:
+                log.warning("Failed to add path (%s) to index", updated_path)
 
     rh = ReleaseHistory.from_git_history(
         repo=repo,
@@ -437,7 +444,15 @@ def version(  # noqa: C901
             )
         elif commit_changes:
             # Anything changed here should be staged.
-            repo.git.add(updated_paths)
+            # TODO: in future this loop should be 1 line:
+            # repo.index.add(updated_paths, force=False)
+            # but since 'force' is deliberally ineffective (as in docstring) in gitpython 3.1.18
+            # we have to do manually add each filepath, and catch the exception if it is an ignored file
+            for updated_path in updated_paths:
+                try:
+                    repo.git.add(updated_path)
+                except GitCommandError:
+                    log.warning("Failed to add path (%s) to index", updated_path)
 
     def custom_git_environment() -> ContextManager[None]:
         """

{python-semantic-release-8.4.0 → python-semantic-release-8.5.1}/semantic_release/cli/config.py

@@ -257,8 +257,18 @@ class RuntimeContext:
         ##
         # credentials masking for logging
         masker = MaskingFilter(_use_named_masks=raw.logging_use_named_masks)
+
+        try:
+            active_branch = repo.active_branch.name
+        except TypeError as err:
+            raise NotAReleaseBranch(
+                "Detached HEAD state cannot match any release groups; "
+                "no release will be made"
+            ) from err
+
         # branch-specific configuration
-        branch_config = cls.select_branch_options(raw.branches, repo.active_branch.name)
+        branch_config = cls.select_branch_options(raw.branches, active_branch)
+
         # commit_parser
         commit_parser_cls = (
             _known_commit_parsers[raw.commit_parser]