python-kacl 0.5.0__tar.gz → 0.5.1__tar.gz

{python_kacl-0.5.0/python_kacl.egg-info → python_kacl-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-kacl
-Version: 0.5.0
+Version: 0.5.1
 Summary: Python module and CLI tool for validating and modifying Changelogs in "keep-a-changelog" format"
 Home-page: https://gitlab.com/schmieder.matthias/python-kacl.git
 Author: Matthias Schmieder

{python_kacl-0.5.0 → python_kacl-0.5.1}/kacl/__init__.py

@@ -1,5 +1,5 @@
 # Version of the python-kacl package
-__version__ = "0.5.0"
+__version__ = "0.5.1"
 
 from kacl.document import KACLDocument
 from kacl.serializer import KACLMarkdownSerializer

{python_kacl-0.5.0 → python_kacl-0.5.1}/kacl/document.py

@@ -293,10 +293,17 @@ class KACLDocument:
                     ):
                         comp_result = future_version.compare(last_version)
                     #   2.3 if 'last version' was NOT a 'post version' ensure 'post version' has same 'base version'
-                    elif future_version_base != last_version_base:
-                        comp_result = -1  # indicate error
                     else:
-                        comp_result = 1
+                        comp_result = future_version_base.compare(last_version_base)
+                        #  2.4 if 'last version' has same 'base version' as 'future version' this is ok, because we
+                        #  define post version as 'higher' than base version
+                        if comp_result == 0:
+                            comp_result = 1
+                elif (
+                    last_version.prerelease
+                    and post_release_version_prefix in last_version.prerelease
+                ):
+                    comp_result = future_version_base.compare(last_version_base)
                 else:
                     comp_result = future_version.compare(last_version)
             else:

{python_kacl-0.5.0 → python_kacl-0.5.1/python_kacl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-kacl
-Version: 0.5.0
+Version: 0.5.1
 Summary: Python module and CLI tool for validating and modifying Changelogs in "keep-a-changelog" format"
 Home-page: https://gitlab.com/schmieder.matthias/python-kacl.git
 Author: Matthias Schmieder

{python_kacl-0.5.0 → python_kacl-0.5.1}/setup.py

@@ -11,7 +11,7 @@ this_directory = path.abspath(path.dirname(__file__))
 with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
-version = "0.5.0"
+version = "0.5.1"
 
 version = f"{version}{os.environ.get('PIP_VERSION_POSTFIX', '')}"
 

{python_kacl-0.5.0 → python_kacl-0.5.1}/tests/test_cli.py

@@ -95,6 +95,128 @@ def test_release_patch(tmp_path, snapshot):
         snapshot_directory(snapshot=snapshot, directory_path=project_root_path)
 
 
+@freeze_time("2023-01-01")
+def test_release_post_bump(tmp_path, snapshot):
+    runner = CliRunner()
+    resources_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data/")
+    changelog_file = os.path.join(resources_dir, "CHANGELOG_with_changes.md")
+
+    with runner.isolated_filesystem(temp_dir=tmp_path) as project_root_path:
+        shutil.copyfile(changelog_file, os.path.join(project_root_path, "CHANGELOG.md"))
+        result = runner.invoke(
+            cli,
+            [
+                "-c",
+                os.path.join(resources_dir, "extension-config.yml"),
+                "-f",
+                "CHANGELOG.md",
+                "release",
+                "post",
+                "-m",
+            ],
+            catch_exceptions=False,
+        )
+        assert result.exit_code == 0, result.output
+        snapshot_directory(snapshot=snapshot, directory_path=project_root_path)
+
+
+@freeze_time("2023-01-01")
+def test_release_post_manual(tmp_path, snapshot):
+    runner = CliRunner()
+    resources_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data/")
+    changelog_file = os.path.join(resources_dir, "CHANGELOG_with_changes.md")
+
+    with runner.isolated_filesystem(temp_dir=tmp_path) as project_root_path:
+        shutil.copyfile(changelog_file, os.path.join(project_root_path, "CHANGELOG.md"))
+        result = runner.invoke(
+            cli,
+            [
+                "-c",
+                os.path.join(resources_dir, "extension-config.yml"),
+                "-f",
+                "CHANGELOG.md",
+                "release",
+                "2.0.0-hotfix.0",
+                "-m",
+            ],
+            catch_exceptions=False,
+        )
+        assert result.exit_code == 0, result.output
+        snapshot_directory(snapshot=snapshot, directory_path=project_root_path)
+
+
+@freeze_time("2023-01-01")
+def test_release_post_manual_fail(tmp_path, snapshot):
+    runner = CliRunner()
+    resources_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data/")
+    changelog_file = os.path.join(resources_dir, "CHANGELOG_with_changes.md")
+
+    with runner.isolated_filesystem(temp_dir=tmp_path) as project_root_path:
+        shutil.copyfile(changelog_file, os.path.join(project_root_path, "CHANGELOG.md"))
+        result = runner.invoke(
+            cli,
+            [
+                "-c",
+                os.path.join(resources_dir, "extension-config.yml"),
+                "-f",
+                "CHANGELOG.md",
+                "release",
+                "0.5.0-hotfix.0",
+                "-m",
+            ],
+            catch_exceptions=True,
+        )
+        assert result.exit_code == 1, result.output
+
+
+@freeze_time("2023-01-01")
+def test_release_version_manual_fail_same_base_after_post(tmp_path, snapshot):
+    runner = CliRunner()
+    resources_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data/")
+    changelog_file = os.path.join(resources_dir, "CHANGELOG_post_with_changes.md")
+
+    with runner.isolated_filesystem(temp_dir=tmp_path) as project_root_path:
+        shutil.copyfile(changelog_file, os.path.join(project_root_path, "CHANGELOG.md"))
+        result = runner.invoke(
+            cli,
+            [
+                "-c",
+                os.path.join(resources_dir, "extension-config.yml"),
+                "-f",
+                "CHANGELOG.md",
+                "release",
+                "1.0.0",
+                "-m",
+            ],
+            catch_exceptions=True,
+        )
+        assert result.exit_code == 1, result.output
+
+
+@freeze_time("2023-01-01")
+def test_release_post_manual_same_base(tmp_path, snapshot):
+    runner = CliRunner()
+    resources_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data/")
+    changelog_file = os.path.join(resources_dir, "CHANGELOG_with_changes.md")
+
+    with runner.isolated_filesystem(temp_dir=tmp_path) as project_root_path:
+        shutil.copyfile(changelog_file, os.path.join(project_root_path, "CHANGELOG.md"))
+        result = runner.invoke(
+            cli,
+            [
+                "-c",
+                os.path.join(resources_dir, "extension-config.yml"),
+                "-f",
+                "CHANGELOG.md",
+                "release",
+                "1.0.0-post.0",
+                "-m",
+            ],
+            catch_exceptions=False,
+        )
+        assert result.exit_code == 0, result.output
+
+
 @freeze_time("2023-01-01")
 def test_release_minor(tmp_path, snapshot):
     runner = CliRunner()