corio 2.3.3__tar.gz → 2.3.4__tar.gz

{corio-2.3.3 → corio-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corio
-Version: 2.3.3
+Version: 2.3.4
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Author-email: Frontmatter AI <innovative.fowler@mask.pro.fmtr.dev>
 License-Expression: Apache-2.0

{corio-2.3.3 → corio-2.3.4}/corio/entrypoint.py

@@ -34,7 +34,7 @@ class Pyproject(dm.Base):
         from corio.paths import paths
 
         project = Project(paths.name_ns)
-        project.versions.pinned = project.versions.old
+        project.versions.pinned = project.versions.new
         return IncrementorPyproject(project.releaser).apply()
 
 

{corio-2.3.3 → corio-2.3.4}/corio/infra/project.py

@@ -103,8 +103,6 @@ class Versions(Inherit[Project]):
 
     def __init__(self, project: Project, pinned: str | None = None):
         super().__init__(project)
-        self.old = self.get()
-
         self.pinned = None
         if pinned:
             self.pinned = version.Version.parse(pinned)

{corio-2.3.3 → corio-2.3.4}/corio/infra/releaser.py

@@ -224,40 +224,65 @@ class Incrementor(Inherit[Releaser]):
 
 
 class IncrementorVersion(Incrementor):
-    @logger.instrument('Incrementing release version in-memory for "{self.paths.name_ns}"...')
-    def apply(self) -> Path | list[Path] | None:
-        old = self.versions.old
-
-        old_tag = f"v{old}"
-        has_old_tag = old_tag in self.repo.tags.all
-
-        if self.versions.pinned:
-            new = self.versions.pinned
-            if not has_old_tag and new != old:
-                logger.warning(
-                    f'Current version tag "{old_tag}" was not found. '
-                    f'Using pinned version "{new}" and continuing.'
-                )
-            elif not has_old_tag:
-                logger.warning(
-                    f'Current version tag "{old_tag}" was not found. '
-                    f'Assuming previous release failed and reusing version "{new}".'
-                )
-        elif not has_old_tag:
+    @cached_property
+    def old(self):
+        return self.paths.metadata.version_obj
+
+    @cached_property
+    def old_tag(self):
+        return self.old.tag
+
+    @cached_property
+    def has_old_tag(self):
+        return self.old_tag in self.repo.tags.all
+
+    @cached_property
+    def pinned_tag(self):
+        if not self.versions.pinned:
+            return None
+        return self.versions.pinned.tag
+
+    @cached_property
+    def pinned(self):
+        new = self.versions.pinned
+        if not new:
+            return None
+
+        if not self.has_old_tag:
+            raise RuntimeError(
+                f'Current version tag "{self.old_tag}" was not found. '
+                f'Refusing pinned release "{new}" until the previous release state is resolved.'
+            )
+
+        if self.pinned_tag in self.repo.tags.all:
+            raise RuntimeError(f'Pinned version tag already exists: "{self.pinned_tag}".')
+
+        return new
+
+    @cached_property
+    def new(self):
+        new = self.pinned
+        if new:
+            return new
+
+        if not self.has_old_tag:
             logger.warning(
-                f'Current version tag "{old_tag}" was not found. '
-                f'Assuming previous release failed and reusing version "{old}".'
+                f'Current version tag "{self.old_tag}" was not found. '
+                f'Assuming previous release failed and reusing version "{self.old}".'
             )
-            new = old
-        elif old.prerelease:
-            new = old.bump_prerelease()
+            return self.old
+
+        if self.old.prerelease:
+            return self.old.bump_prerelease()
         else:
-            new = old.bump_patch()
+            return self.old.bump_patch()
 
-        if old != new:
-            logger.info(f'Incrementing runtime version {old} {Constants.ARROW_RIGHT} {new}...')
+    @logger.instrument('Incrementing release version in-memory for "{self.paths.name_ns}"...')
+    def apply(self) -> Path | list[Path] | None:
+        if self.old != self.new:
+            logger.info(f'Incrementing runtime version {self.old} {Constants.ARROW_RIGHT} {self.new}...')
 
-        self.paths.metadata.version = str(new)
+        self.paths.metadata.version = str(self.new)
         return None
 
 

{corio-2.3.3 → corio-2.3.4}/corio/pyproject.package.toml

@@ -1,6 +1,6 @@
 [project]
 name = "corio"
-version = "2.3.3"
+version = "2.3.4"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"
 readme = "README.md"
 dependencies = []
@@ -83,7 +83,7 @@ Homepage = "https://github.com/fmtr/corio"
 corio = "corio.entrypoint:main"
 
 [tool.corio.metadata]
-version = "2.3.3"
+version = "2.3.4"
 port = 0
 base = "python"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"

{corio-2.3.3 → corio-2.3.4}/corio/tests/test_infra.py

@@ -349,10 +349,10 @@ def test_repository_get_most_recent_release_tag_filters_and_orders():
 
 
 def _make_version_incrementor(*, old: str, pinned: str | None, tags: set[str]):
-    metadata = SimpleNamespace(version=old)
+    metadata = SimpleNamespace(version=old, version_obj=version.parse(old))
     parent = SimpleNamespace(
         paths=SimpleNamespace(name_ns="corio", metadata=metadata),
-        versions=SimpleNamespace(old=version.parse(old), pinned=version.parse(pinned) if pinned else None),
+        versions=SimpleNamespace(pinned=version.parse(pinned) if pinned else None),
         repo=SimpleNamespace(tags=SimpleNamespace(all=tags)),
     )
     return IncrementorVersion(parent), metadata
@@ -370,16 +370,35 @@ def test_incrementor_version_does_not_increment_when_old_tag_missing():
     assert metadata.version == "1.2.3"
 
 
-def test_incrementor_version_uses_pinned_even_when_old_tag_missing():
-    incrementor, metadata = _make_version_incrementor(
+def test_incrementor_version_raises_when_pinned_and_old_tag_missing():
+    incrementor, _ = _make_version_incrementor(
         old="1.2.3",
         pinned="2.0.0",
         tags={"v1.2.2"},
     )
 
-    incrementor.apply()
+    try:
+        incrementor.apply()
+    except RuntimeError as exception:
+        assert 'Current version tag "v1.2.3" was not found.' in str(exception)
+        assert 'Refusing pinned release "2.0.0"' in str(exception)
+    else:
+        raise AssertionError("Expected RuntimeError when old tag is missing for pinned release.")
+
 
-    assert metadata.version == "2.0.0"
+def test_incrementor_version_raises_when_pinned_tag_exists():
+    incrementor, _ = _make_version_incrementor(
+        old="1.2.3",
+        pinned="2.0.0",
+        tags={"v1.2.3", "v2.0.0"},
+    )
+
+    try:
+        incrementor.apply()
+    except RuntimeError as exception:
+        assert 'Pinned version tag already exists: "v2.0.0".' in str(exception)
+    else:
+        raise AssertionError("Expected RuntimeError when pinned tag already exists.")
 
 
 def test_releaser_run_commits_only_after_tests_pass(monkeypatch):

{corio-2.3.3 → corio-2.3.4}/corio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corio
-Version: 2.3.3
+Version: 2.3.4
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Author-email: Frontmatter AI <innovative.fowler@mask.pro.fmtr.dev>
 License-Expression: Apache-2.0

{corio-2.3.3 → corio-2.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "corio"
-version = "2.3.3"
+version = "2.3.4"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"
 readme = "README.md"
 dependencies = []
@@ -83,7 +83,7 @@ Homepage = "https://github.com/fmtr/corio"
 corio = "corio.entrypoint:main"
 
 [tool.corio.metadata]
-version = "2.3.3"
+version = "2.3.4"
 port = 0
 base = "python"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"