corio 2.3.1__tar.gz → 2.3.2a2__tar.gz

{corio-2.3.1 → corio-2.3.2a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corio
-Version: 2.3.1
+Version: 2.3.2a2
 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.1 → corio-2.3.2a2}/corio/infra/api.py

@@ -39,11 +39,10 @@ class Api(api.Base):
             self,
             name: str,
             pinned: str = None,
-            increment: bool = True,
             build: bool = False,
             release: bool = True,
             cache: bool = True,
     ):
         project = Project(name, pinned=pinned)
 
-        project.releaser.run(increment=increment, build=build, release=release, cache=cache)
+        project.releaser.run(build=build, release=release, cache=cache)

{corio-2.3.1 → corio-2.3.2a2}/corio/infra/releaser.py

@@ -40,13 +40,12 @@ class Releaser(Inherit[Project]):
     """
 
     @logger.instrument("Releasing {self.paths.name_ns}...")
-    def run(self, increment: bool = True, build: bool = False, release: bool = True, cache: bool = True):
+    def run(self, build: bool = False, release: bool = True, cache: bool = True):
 
         from corio.infra.stack import ProductionPrivate, ProductionPublic
 
-        if increment:
-            self.repo.fetch()
-            self.increment()
+        self.repo.fetch()
+        self.increment()
 
         is_passed = self.tester.run()
         if not is_passed:
@@ -55,9 +54,9 @@ class Releaser(Inherit[Project]):
             else:
                 raise RuntimeError("Tests failed. Aborting release.")
 
-        if increment:
-            self.repo.push()
-            self.repo.fetch()
+        self.commit()
+        self.repo.push()
+        self.repo.fetch()
 
         stack_types = []
         if build:
@@ -78,22 +77,28 @@ class Releaser(Inherit[Project]):
     def message(self):
         return f"Release version {self.version}"
 
-    @logger.instrument("Incrementing version numbers {self.repo.origin.url}...")
-    def increment(self):
-        """
-
-        Increment version numbers in project files, create a new commit, and rebase the release branch.
-        
-        """
-        repo = self.repo
+    @cached_property
+    def main_ref(self):
+        return self.repo.lookup_reference("refs/heads/main")
 
-        main_ref = repo.lookup_reference("refs/heads/main")  # todo raise if not main?
-        parent = main_ref.peel(vcs.Commit)
+    @cached_property
+    def parent_commit(self):
+        return self.main_ref.peel(vcs.Commit)
 
+    @cached_property
+    def index(self):
+        index = self.repo.index
         # Make sure we're building on main's HEAD (not whatever HEAD currently is).
-        index = repo.index
-        index.read_tree(parent.tree)
+        index.read_tree(self.parent_commit.tree)
+        return index
+
+    @logger.instrument("Applying version incrementors {self.repo.origin.url}...")
+    def increment(self):
+        """
 
+        Apply incrementors and stage changed files.
+
+        """
         # Apply incrementors (they edit files in the working tree), then stage results.
         for incrementor in self.incrementors:
             paths = incrementor.apply()
@@ -104,18 +109,22 @@ class Releaser(Inherit[Project]):
 
             for path in paths:
                 rel = str(Path(path).relative_to(self.paths.repo))
-                index.add(rel)
+                self.index.add(rel)
 
-        index.write()
-        tree = index.write_tree(repo)
+        self.index.write()
+
+    @logger.instrument("Committing release changes {self.repo.origin.url}...")
+    def commit(self):
+        repo = self.repo
+        tree = self.index.write_tree(repo)
 
         commit_id = repo.create_commit(
-            main_ref.name,
+            self.main_ref.name,
             repo.default_signature,
             repo.default_signature,
             self.message,
             tree,
-            [parent.id],
+            [self.parent_commit.id],
         )
 
         try:
@@ -218,8 +227,28 @@ 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:
+            logger.warning(
+                f'Current version tag "{old_tag}" was not found. '
+                f'Assuming previous release failed and reusing version "{old}".'
+            )
+            new = old
         elif old.prerelease:
             new = old.bump_prerelease()
         else:
@@ -370,17 +399,33 @@ class ReleaseGithub(Release):
     
     """
 
+    @cached_property
+    def previous_version(self):
+        return self.repo.get_most_recent_release_tag(
+            include_pre=self.versions.is_pre,
+            before=self.version,
+        )
+
+    @property
+    def previous_tag(self):
+        if not self.previous_version:
+            return None
+        return self.previous_version.tag
+
     @property
     def url(self):
-        return f"{self.repo_url}/compare/v{self.versions.old}...v{self.versions.new}"
+        if not self.previous_tag:
+            return None
+        return f"{self.repo_url}/compare/{self.previous_tag}...{self.tag}"
 
     @property
     def body(self):
         path_changelog = self.incrementors.cls[IncrementorChangelog].dest
         if path_changelog.exists():
             return path_changelog.read_text()
-        else:
-            return f'**Full Changelog**: [{self.versions.old} {Constants.ARROW_RIGHT} {self.versions.new}]({self.url})'
+        if not self.previous_version:
+            return None
+        return f'**Full Changelog**: [{self.previous_tag} {Constants.ARROW_RIGHT} {self.tag}]({self.url})'
 
     def release(self):
         url = f"{self.repo_api_url}/releases"

{corio-2.3.1 → corio-2.3.2a2}/corio/infra/repository.py

@@ -2,6 +2,7 @@ import pygit2 as vcs
 from functools import cached_property
 from typing import Any
 
+from corio import version
 from corio.inherit import Inherit
 from corio.logs import logger
 from corio.path import Path
@@ -61,6 +62,39 @@ class Repository(vcs.Repository):
 
         return self.origin.push(specs, callbacks=self.callbacks)
 
+    def get_most_recent_release_tag(self, include_pre: bool = True, before=None):
+        before_version = None
+        if before is not None:
+            if isinstance(before, str):
+                before = before.removeprefix("v")
+                before_version = version.parse(before)
+            else:
+                before_version = before
+
+        candidates = []
+        for tag in self.tags.all:
+            if not tag.startswith("v"):
+                continue
+            text = tag.removeprefix("v")
+            try:
+                parsed = version.parse(text)
+            except ValueError:
+                continue
+
+            if before_version is not None and parsed >= before_version:
+                continue
+
+            if not include_pre and parsed.prerelease:
+                continue
+
+            candidates.append(parsed)
+
+        if not candidates:
+            return None
+
+        candidates.sort(reverse=True)
+        return candidates[0]
+
 
 
 

{corio-2.3.1 → corio-2.3.2a2}/corio/pyproject.package.toml

@@ -1,6 +1,6 @@
 [project]
 name = "corio"
-version = "2.3.1"
+version = "2.3.2-alpha002"
 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.1"
+version = "2.3.2-alpha002"
 port = 0
 base = "python"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"

{corio-2.3.1 → corio-2.3.2a2}/corio/tests/test_infra.py

@@ -2,8 +2,10 @@ from types import SimpleNamespace
 
 from packaging.requirements import Requirement
 
+from corio import version
 from corio.infra.incrementor_pyproject import IncrementorPyproject, GeneratorTestEnvs
-from corio.infra.releaser import Tester as ReleaserTester
+from corio.infra.releaser import Releaser, IncrementorVersion, Tester as ReleaserTester
+from corio.infra.repository import Repository
 from corio.path import Path
 
 
@@ -319,3 +321,118 @@ def test_tester_run_returns_false_when_subprocess_fails(tmp_path, monkeypatch):
     monkeypatch.setattr(ReleaserTester, "run_subprocess", lambda self: 1)
 
     assert tester.run() is False
+
+
+def test_repository_get_most_recent_release_tag_filters_and_orders():
+    repo = SimpleNamespace(tags=SimpleNamespace(all={
+        "v1.2.1",
+        "v1.2.2-rc.1",
+        "v1.2.2",
+        "v1.3.0-rc.1",
+        "junk",
+    }))
+
+    any_tag = Repository.get_most_recent_release_tag(repo, include_pre=True)
+    stable_tag = Repository.get_most_recent_release_tag(repo, include_pre=False)
+    previous_stable = Repository.get_most_recent_release_tag(
+        repo, include_pre=False, before=version.parse("1.2.2"),
+    )
+    previous_any = Repository.get_most_recent_release_tag(
+        repo, include_pre=True, before=version.parse("1.2.2"),
+    )
+
+    assert any_tag == version.parse("1.3.0-rc.1")
+    assert stable_tag == version.parse("1.2.2")
+    assert previous_stable == version.parse("1.2.1")
+    assert previous_any == version.parse("1.2.2-rc.1")
+    assert stable_tag.tag == "v1.2.2"
+
+
+def _make_version_incrementor(*, old: str, pinned: str | None, tags: set[str]):
+    metadata = SimpleNamespace(version=old)
+    parent = SimpleNamespace(
+        paths=SimpleNamespace(name_ns="corio", metadata=metadata),
+        versions=SimpleNamespace(old=version.parse(old), pinned=version.parse(pinned) if pinned else None),
+        repo=SimpleNamespace(tags=SimpleNamespace(all=tags)),
+    )
+    return IncrementorVersion(parent), metadata
+
+
+def test_incrementor_version_does_not_increment_when_old_tag_missing():
+    incrementor, metadata = _make_version_incrementor(
+        old="1.2.3",
+        pinned=None,
+        tags={"v1.2.2"},
+    )
+
+    incrementor.apply()
+
+    assert metadata.version == "1.2.3"
+
+
+def test_incrementor_version_uses_pinned_even_when_old_tag_missing():
+    incrementor, metadata = _make_version_incrementor(
+        old="1.2.3",
+        pinned="2.0.0",
+        tags={"v1.2.2"},
+    )
+
+    incrementor.apply()
+
+    assert metadata.version == "2.0.0"
+
+
+def test_releaser_run_commits_only_after_tests_pass(monkeypatch):
+    events = []
+
+    class _Repo:
+        def fetch(self):
+            events.append("fetch")
+
+        def push(self):
+            events.append("push")
+
+    releaser = Releaser(SimpleNamespace(
+        name="corio",
+        paths=SimpleNamespace(name_ns="corio", metadata=SimpleNamespace(is_dockerhub=False, is_pypi=False)),
+    ))
+    releaser.repo = _Repo()
+    releaser.tester = SimpleNamespace(run=lambda: events.append("tests") or True)
+
+    monkeypatch.setattr(Releaser, "increment", lambda self: events.append("increment"))
+    monkeypatch.setattr(Releaser, "commit", lambda self: events.append("commit"))
+
+    releaser.run(build=False, release=False)
+
+    assert events == ["fetch", "increment", "tests", "commit", "push", "fetch"]
+
+
+def test_releaser_run_continues_when_pre_tests_fail(monkeypatch):
+    events = []
+
+    class _Repo:
+        def fetch(self):
+            events.append("fetch")
+
+        def push(self):
+            events.append("push")
+
+    releaser = Releaser(SimpleNamespace(
+        name="corio",
+        version=version.parse("1.2.3-rc.1"),
+        versions=SimpleNamespace(is_pre=True),
+        paths=SimpleNamespace(name_ns="corio", metadata=SimpleNamespace(is_dockerhub=False, is_pypi=False)),
+    ))
+    releaser.repo = _Repo()
+    releaser.tester = SimpleNamespace(run=lambda: events.append("tests") or False)
+
+    monkeypatch.setattr(Releaser, "increment", lambda self: events.append("increment"))
+    monkeypatch.setattr(Releaser, "commit", lambda self: events.append("commit"))
+
+    releaser.run(build=False, release=False)
+
+    assert events == ["fetch", "increment", "tests", "commit", "push", "fetch"]
+
+
+def test_intentional_failure_for_testing():
+    assert False, "Intentional failing test for test-pipeline verification."

corio-2.3.2a2/corio/version/__init__.py

@@ -0,0 +1,14 @@
+from corio.version.version import read, read_path, get
+
+import semver
+
+semver = semver
+
+
+class Version(semver.Version):
+    @property
+    def tag(self) -> str:
+        return f"v{self}"
+
+
+parse = Version.parse

{corio-2.3.1 → corio-2.3.2a2}/corio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corio
-Version: 2.3.1
+Version: 2.3.2a2
 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.1 → corio-2.3.2a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "corio"
-version = "2.3.1"
+version = "2.3.2-alpha002"
 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.1"
+version = "2.3.2-alpha002"
 port = 0
 base = "python"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"

corio-2.3.1/corio/version/__init__.py

@@ -1,7 +0,0 @@
-from corio.version.version import read, read_path, get
-
-import semver
-
-semver = semver
-parse = semver.VersionInfo.parse
-Version = semver.Version