Merge pull request #500 from lbedner/v0.6.0-rc2

Deployment

Author: lbedner

CLAUDE.md

@@ -32,7 +32,7 @@ Each generated project includes:
 
 ## Installation
 
-**Current Version**: 0.6.0rc1
+**Current Version**: 0.6.0rc2
 
 ```bash
 pip install aegis-stack

aegis/__init__.py

@@ -2,4 +2,4 @@
 Aegis Stack CLI - Component generation and project management tools.
 """
 
-__version__ = "0.6.0rc1"
+__version__ = "0.6.0rc2"

aegis/config/defaults.py

@@ -5,6 +5,7 @@
 a single source of truth.
 """
 
+import re
 from pathlib import Path
 
 
@@ -94,6 +95,26 @@ def _generate_supported_versions(min_version: str, max_version: str) -> list[str
 # Supported Python versions (auto-generated from min to max)
 SUPPORTED_PYTHON_VERSIONS = _generate_supported_versions(_min_version, _max_version)
 
+
+def version_to_git_tag(version: str) -> str:
+    """
+    Convert a PEP 440 version string to a git tag.
+
+    PEP 440 uses no separator before pre-release identifiers (e.g., 0.6.0rc1),
+    but our git tags use a dash (e.g., v0.6.0-rc1).
+
+    Args:
+        version: PEP 440 version string (e.g., "0.6.0rc1", "0.5.4")
+
+    Returns:
+        Git tag string (e.g., "v0.6.0-rc1", "v0.5.4")
+    """
+    # Insert dash before pre-release identifiers: rc, alpha, beta, dev
+    # Negative lookbehind ensures we don't double-dash if already present
+    normalized = re.sub(r"(?<!-)(rc|alpha|beta|dev)(\d+)", r"-\1\2", version)
+    return f"v{normalized}"
+
+
 # GitHub URL for template source (used when installed via pip/uvx)
 GITHUB_TEMPLATE_URL = "gh:lbedner/aegis-stack"
 

aegis/core/copier_manager.py

@@ -16,7 +16,11 @@
 
 from aegis import __version__
 
-from ..config.defaults import DEFAULT_PYTHON_VERSION, GITHUB_TEMPLATE_URL
+from ..config.defaults import (
+    DEFAULT_PYTHON_VERSION,
+    GITHUB_TEMPLATE_URL,
+    version_to_git_tag,
+)
 from ..constants import AnswerKeys, StorageBackends
 from .migration_generator import (
     generate_migrations_for_services,
@@ -159,7 +163,7 @@ def generate_with_copier(
         # Use GitHub URL for template source with CLI version as default ref
         # This ensures CLI v0.4.1 uses template v0.4.1, not HEAD
         template_source = GITHUB_TEMPLATE_URL
-        resolved_ref = vcs_ref if vcs_ref else f"v{__version__}"
+        resolved_ref = vcs_ref if vcs_ref else version_to_git_tag(__version__)
 
     # Store template version in answers for future reference
     # This allows aegis update to show "v0.4.1" instead of commit hash

aegis/core/copier_updater.py

@@ -13,7 +13,7 @@
 from packaging.version import parse
 from pydantic import BaseModel, Field
 
-from aegis.config.defaults import GITHUB_REPO_URL
+from aegis.config.defaults import GITHUB_REPO_URL, version_to_git_tag
 from aegis.constants import AnswerKeys, ComponentNames, StorageBackends
 from aegis.core.copier_manager import load_copier_answers
 from aegis.core.post_gen_tasks import cleanup_components, run_post_generation_tasks
@@ -432,7 +432,7 @@ def resolve_version_to_ref(
     if not version or version == "latest":
         latest = get_latest_version(template_root)
         if latest:
-            return f"v{latest}"
+            return version_to_git_tag(latest)
         return "HEAD"
 
     # Check if it's a commit hash (40 hex characters)
@@ -442,9 +442,9 @@ def resolve_version_to_ref(
     # Check if it looks like a version number (add 'v' prefix)
     try:
         parse(version)
-        # Valid version number - always use v-prefixed tag format
-        # (git verification may fail when installed via pip/uvx, but tag format is consistent)
-        return f"v{version}"
+        # Valid version number - convert to git tag format
+        # PEP 440 "0.6.0rc1" → git tag "v0.6.0-rc1"
+        return version_to_git_tag(version)
     except Exception:
         pass
 
@@ -793,7 +793,7 @@ def get_commit_for_version(
         template_root = get_template_root()
 
     # Ensure version has 'v' prefix
-    tag_name = version if version.startswith("v") else f"v{version}"
+    tag_name = version if version.startswith("v") else version_to_git_tag(version)
 
     try:
         result = subprocess.run(

copier.yml

@@ -6,7 +6,7 @@
 # - Update support
 
 _min_copier_version: "9.0.0"
-_version: "0.6.0rc1"
+_version: "0.6.0rc2"
 
 # IMPORTANT: Template content is in subdirectory
 # This allows the template to be recognized as git-tracked (aegis-stack repo root has .git)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aegis-stack"
-version = "0.6.0rc1"
+version = "0.6.0rc2"
 description = "A production-ready Python foundation for builders who refuse to wait. Try: uvx aegis-stack init my-project"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"

tests/config/test_defaults.py

@@ -11,6 +11,7 @@
     SUPPORTED_PYTHON_VERSIONS,
     _generate_supported_versions,
     _parse_python_version_bounds,
+    version_to_git_tag,
 )
 
 
@@ -156,6 +157,38 @@ def test_supported_versions_sorted_ascending(self) -> None:
         assert versions_as_tuples == sorted(versions_as_tuples)
 
 
+class TestVersionToGitTag:
+    """Test version_to_git_tag() function."""
+
+    def test_rc_version(self) -> None:
+        """Test release candidate versions get dash inserted."""
+        assert version_to_git_tag("0.6.0rc1") == "v0.6.0-rc1"
+        assert version_to_git_tag("0.6.0rc2") == "v0.6.0-rc2"
+        assert version_to_git_tag("1.0.0rc10") == "v1.0.0-rc10"
+
+    def test_stable_version(self) -> None:
+        """Test stable versions are unchanged (just prefixed with v)."""
+        assert version_to_git_tag("0.5.4") == "v0.5.4"
+        assert version_to_git_tag("1.0.0") == "v1.0.0"
+
+    def test_alpha_version(self) -> None:
+        """Test alpha pre-release versions."""
+        assert version_to_git_tag("0.7.0alpha1") == "v0.7.0-alpha1"
+
+    def test_beta_version(self) -> None:
+        """Test beta pre-release versions."""
+        assert version_to_git_tag("0.7.0beta2") == "v0.7.0-beta2"
+
+    def test_dev_version(self) -> None:
+        """Test dev pre-release versions."""
+        assert version_to_git_tag("0.8.0dev1") == "v0.8.0-dev1"
+
+    def test_already_has_dash(self) -> None:
+        """Test versions that already contain a dash don't get double-dashed."""
+        # If someone passes "0.6.0-rc1" it should become "v0.6.0-rc1", not "v0.6.0--rc1"
+        assert version_to_git_tag("0.6.0-rc1") == "v0.6.0-rc1"
+
+
 class TestIntegration:
     """Integration tests for configuration system."""
 

tests/core/test_copier_updater.py

@@ -396,17 +396,17 @@ def git_repo_with_tags(tmp_path: Path) -> Path:
         ["git", "tag", "v0.2.0"], cwd=tmp_path, capture_output=True, check=True
     )
 
-    # Add a prerelease tag
-    (tmp_path / "test.txt").write_text("v0.3.0rc1")
+    # Add a prerelease tag (dash format matches our git tag convention)
+    (tmp_path / "test.txt").write_text("v0.3.0-rc1")
     subprocess.run(["git", "add", "."], cwd=tmp_path, capture_output=True, check=True)
     subprocess.run(
-        ["git", "commit", "-m", "v0.3.0rc1"],
+        ["git", "commit", "-m", "v0.3.0-rc1"],
         cwd=tmp_path,
         capture_output=True,
         check=True,
     )
     subprocess.run(
-        ["git", "tag", "v0.3.0rc1"], cwd=tmp_path, capture_output=True, check=True
+        ["git", "tag", "v0.3.0-rc1"], cwd=tmp_path, capture_output=True, check=True
     )
 
     # Add another prerelease
@@ -444,7 +444,7 @@ def test_excludes_prereleases_by_default(self, git_repo_with_tags: Path) -> None
         versions = get_available_versions(git_repo_with_tags)
 
         # Should NOT contain rc or alpha versions
-        assert "0.3.0rc1" not in versions
+        assert "0.3.0-rc1" not in versions
         assert "0.3.0-alpha.1" not in versions
 
     def test_includes_prereleases_when_requested(
@@ -454,7 +454,7 @@ def test_includes_prereleases_when_requested(
         versions = get_available_versions(git_repo_with_tags, include_prereleases=True)
 
         # Should contain all versions including prereleases
-        assert "0.3.0rc1" in versions
+        assert "0.3.0-rc1" in versions
         assert "0.3.0-alpha.1" in versions
         assert "0.2.0" in versions
         assert "0.1.0" in versions
@@ -484,7 +484,7 @@ def test_returns_latest_non_prerelease_version(
         """Test that latest version is 0.2.0, not a prerelease."""
         latest = get_latest_version(git_repo_with_tags)
 
-        # Should be 0.2.0, NOT 0.3.0rc1 or 0.3.0-alpha.1
+        # Should be 0.2.0, NOT 0.3.0-rc1 or 0.3.0-alpha.1
         assert latest == "0.2.0"
 
     def test_returns_none_for_no_versions(self, git_repo: Path) -> None: