Merge pull request #314 from callowayproject/313-python-38-typeerrorfix

Fix some bugs

bumpversion/config/models.py

@@ -101,7 +101,7 @@ class Config(BaseSettings):
     pep621_info: Optional[PEP621Info]
     scm_info: Optional[SCMInfo]
     parts: Dict[str, VersionComponentSpec]
-    moveable_tags: list[str] = Field(default_factory=list)
+    moveable_tags: List[str] = Field(default_factory=list)
     files: List[FileChange] = Field(default_factory=list)
     setup_hooks: List[str] = Field(default_factory=list)
     pre_commit_hooks: List[str] = Field(default_factory=list)
@@ -113,6 +113,8 @@ class Config(BaseSettings):
 
     def add_files(self, filename: Union[str, List[str]]) -> None:
         """Add a filename to the list of files."""
+        if not filename:
+            return
         filenames = [filename] if isinstance(filename, str) else filename
         files = set(self.files)
         for name in filenames:

bumpversion/config/utils.py

@@ -24,7 +24,7 @@ def get_all_file_configs(config_dict: dict) -> List[FileChange]:
         "regex": config_dict["regex"],
         "include_bumps": tuple(config_dict["parts"]),
     }
-    files = [{k: v for k, v in filecfg.items() if v is not None} for filecfg in config_dict["files"]]
+    files = [{k: v for k, v in filecfg.items() if v is not None} for filecfg in filter(None, config_dict["files"])]
     for f in files:
         f.update({k: v for k, v in defaults.items() if k not in f})
     return [FileChange(**f) for f in files]

bumpversion/scm/git.py

@@ -6,7 +6,7 @@
 import subprocess
 from pathlib import Path
 from tempfile import NamedTemporaryFile
-from typing import Any, ClassVar, MutableMapping, Optional
+from typing import Any, ClassVar, List, MutableMapping, Optional
 
 from bumpversion.exceptions import DirtyWorkingDirectoryError
 from bumpversion.scm.models import LatestTagInfo, SCMConfig
@@ -19,9 +19,9 @@
 class Git:
     """Git implementation."""
 
-    _TEST_AVAILABLE_COMMAND: ClassVar[list[str]] = ["git", "rev-parse", "--git-dir"]
-    _COMMIT_COMMAND: ClassVar[list[str]] = ["git", "commit", "-F"]
-    _ALL_TAGS_COMMAND: ClassVar[list[str]] = ["git", "tag", "--list"]
+    _TEST_AVAILABLE_COMMAND: ClassVar[List[str]] = ["git", "rev-parse", "--git-dir"]
+    _COMMIT_COMMAND: ClassVar[List[str]] = ["git", "commit", "-F"]
+    _ALL_TAGS_COMMAND: ClassVar[List[str]] = ["git", "tag", "--list"]
 
     def __init__(self, config: SCMConfig):
         self.config = config
@@ -73,7 +73,7 @@ def add_path(self, path: Pathlike) -> None:
         except subprocess.CalledProcessError as e:
             format_and_raise_error(e)
 
-    def get_all_tags(self) -> list[str]:
+    def get_all_tags(self) -> List[str]:
         """Return all tags in git."""
         try:
             result = run_command(self._ALL_TAGS_COMMAND)
@@ -86,7 +86,7 @@ def get_all_tags(self) -> list[str]:
         ):
             return []
 
-    def commit_and_tag(self, files: list[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
+    def commit_and_tag(self, files: List[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
         """Commit and tag files to the repository using the configuration."""
         if dry_run:
             return

bumpversion/scm/hg.py

@@ -1,7 +1,7 @@
 """Mercurial source control management."""
 
 import subprocess
-from typing import ClassVar, MutableMapping, Optional
+from typing import ClassVar, List, MutableMapping, Optional
 
 from bumpversion.exceptions import DirtyWorkingDirectoryError, SignedTagsError
 from bumpversion.scm.models import LatestTagInfo, SCMConfig
@@ -14,9 +14,9 @@
 class Mercurial:
     """Mercurial source control management."""
 
-    _TEST_AVAILABLE_COMMAND: ClassVar[list[str]] = ["hg", "root"]
-    _COMMIT_COMMAND: ClassVar[list[str]] = ["hg", "commit", "--logfile"]
-    _ALL_TAGS_COMMAND: ClassVar[list[str]] = ["hg", "log", '--rev="tag()"', '--template="{tags}\n"']
+    _TEST_AVAILABLE_COMMAND: ClassVar[List[str]] = ["hg", "root"]
+    _COMMIT_COMMAND: ClassVar[List[str]] = ["hg", "commit", "--logfile"]
+    _ALL_TAGS_COMMAND: ClassVar[List[str]] = ["hg", "log", '--rev="tag()"', '--template="{tags}\n"']
 
     def __init__(self, config: SCMConfig):
         self.config = config
@@ -54,7 +54,7 @@ def add_path(self, path: Pathlike) -> None:
         """Add a path to the Source Control Management repository."""
         pass
 
-    def commit_and_tag(self, files: list[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
+    def commit_and_tag(self, files: List[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
         """Commit and tag files to the repository using the configuration."""
 
     def tag(self, name: str, sign: bool = False, message: Optional[str] = None) -> None:

bumpversion/scm/models.py

@@ -88,11 +88,11 @@ def add_path(self, path: Pathlike) -> None:
         """Add a path to the pending commit."""
         ...
 
-    def get_all_tags(self) -> list[str]:
+    def get_all_tags(self) -> List[str]:
         """Return all tags in the SCM."""
         ...
 
-    def commit_and_tag(self, files: list[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
+    def commit_and_tag(self, files: List[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
         """Commit and tag files to the repository using the configuration."""
         ...
 
@@ -132,11 +132,11 @@ def add_path(self, path: Pathlike) -> None:
         """Add a path to the pending commit."""
         logger.debug("No source code management system configured. Skipping adding path '%s'.", path)
 
-    def get_all_tags(self) -> list[str]:
+    def get_all_tags(self) -> List[str]:
         """Return all tags in the SCM."""
         return []
 
-    def commit_and_tag(self, files: list[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
+    def commit_and_tag(self, files: List[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
         """Pretend to commit and tag files to the repository using the configuration."""
         logger.debug("No source code management system configured. Skipping committing and tagging.")
 
@@ -210,7 +210,7 @@ def path_in_repo(self, path: Pathlike) -> bool:
             return True
         return str(path).startswith(str(self.repository_root))
 
-    def commit_and_tag(self, files: list[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
+    def commit_and_tag(self, files: List[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
         """Commit the files to the source code management system."""
         logger.indent()
 
@@ -227,7 +227,7 @@ def commit_and_tag(self, files: list[Pathlike], context: MutableMapping, dry_run
         self.tool.commit_and_tag(files=files, context=context, dry_run=dry_run)
         logger.dedent()
 
-    def _commit(self, files: list[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
+    def _commit(self, files: List[Pathlike], context: MutableMapping, dry_run: bool = False) -> None:
         """Commit the files to the source code management system."""
         do_commit = not dry_run
         logger.info("%s the commit", "Preparing" if do_commit else "Would prepare")

tests/test_bump.py

@@ -692,3 +692,46 @@ def test_changes_to_files_are_committed(git_repo: Path, caplog):
     with inside_dir(git_repo):
         status = run_command(["git", "status", "--porcelain"])
         assert status.stdout == ""
+
+
+def test_empty_files_config_is_ignored(git_repo: Path, caplog):
+    """An empty files config should be ignored."""
+    # Arrange
+    config_path = git_repo / ".bumpversion.toml"
+    config_path.write_text(
+        dedent(
+            """
+            [tool.bumpversion]
+            current_version = "0.1.26"
+            tag_name = "{new_version}"
+            commit = true
+
+            [[tool.bumpversion.files]]
+
+            """
+        ),
+        encoding="utf-8",
+    )
+    with inside_dir(git_repo):
+        run_command(["git", "add", str(config_path)])
+        run_command(["git", "commit", "-m", "Initial commit"])
+        run_command(["git", "tag", "0.1.26"])
+
+    # Act
+    runner: CliRunner = CliRunner()
+    with inside_dir(git_repo):
+        result: Result = runner.invoke(
+            cli.cli,
+            ["bump", "-vv", "minor"],
+        )
+
+    if result.exit_code != 0:
+        print(caplog.text)
+        print("Here is the output:")
+        print(result.output)
+        import traceback
+
+        print(traceback.print_exception(*result.exc_info))
+
+    # Assert
+    assert result.exit_code == 0