Skip to content

Commit e48b789

Browse files
authored
Merge pull request #286 from lbedner/v0.2.1-rc3
Bump Version
2 parents efbd97d + 8ca12c2 commit e48b789

10 files changed

Lines changed: 35 additions & 9 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ ipython_config.py
7979

8080
# pyenv
8181
.python-version
82+
# But include template .python-version files
83+
!aegis/templates/**/.python-version
84+
!aegis/templates/**/.python-version.jinja
8285

8386
# celery beat schedule file
8487
celerybeat-schedule

aegis/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Aegis Stack CLI - Component generation and project management tools.
33
"""
44

5-
__version__ = "0.2.1-rc2"
5+
__version__ = "0.2.1-rc3"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{ cookiecutter.python_version }}

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11-slim
1+
FROM python:{{ cookiecutter.python_version }}-slim
22

33
# Install system dependencies and clean up
44
RUN apt-get update -y && \

aegis/templates/cookiecutter-aegis-project/{{cookiecutter.project_slug}}/clean-validation/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11-slim
1+
FROM python:{{ cookiecutter.python_version }}-slim
22

33
# Install system dependencies and clean up
44
RUN apt-get update -y && \
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{ python_version }}

aegis/templates/copier-aegis-project/{{ project_slug }}/Dockerfile renamed to aegis/templates/copier-aegis-project/{{ project_slug }}/Dockerfile.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11-slim
1+
FROM python:{{ python_version }}-slim
22

33
# Install system dependencies and clean up
44
RUN apt-get update -y && \

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "aegis-stack"
3-
version = "0.2.1-rc2"
3+
version = "0.2.1-rc3"
44
description = "A production-ready Python foundation for builders who refuse to wait. Try: uvx aegis-stack init my-project"
55
readme = "README.md"
66
requires-python = ">=3.11,<3.14"

tests/cli/test_python_version.py

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,32 @@ def test_valid_python_versions(self) -> None:
3434
"--help", # Don't actually create project
3535
)
3636
# Help should work with valid versions
37-
assert result.success or "Initialize a new Aegis Stack project" in result.stdout
37+
assert (
38+
result.success
39+
or "Initialize a new Aegis Stack project" in result.stdout
40+
)
3841

3942
def test_invalid_python_version(self) -> None:
4043
"""Test that invalid Python versions are rejected."""
4144
result = run_aegis_command(
4245
"init", "test-project", "--python-version", "3.10", "--no-interactive"
4346
)
4447
assert not result.success
45-
assert "Invalid Python version" in result.stderr or "Invalid Python version" in result.stdout
48+
assert (
49+
"Invalid Python version" in result.stderr
50+
or "Invalid Python version" in result.stdout
51+
)
4652

4753
def test_invalid_python_version_format(self) -> None:
4854
"""Test that malformed Python versions are rejected."""
4955
result = run_aegis_command(
5056
"init", "test-project", "--python-version", "invalid", "--no-interactive"
5157
)
5258
assert not result.success
53-
assert "Invalid Python version" in result.stderr or "Invalid Python version" in result.stdout
59+
assert (
60+
"Invalid Python version" in result.stderr
61+
or "Invalid Python version" in result.stdout
62+
)
5463

5564

5665
@pytest.mark.parametrize("engine", ["cookiecutter", "copier"])
@@ -88,6 +97,9 @@ def test_default_python_version(
8897
project_path, "pyproject.toml", 'requires-python = ">=3.13"'
8998
)
9099

100+
# Check Dockerfile has correct Python version
101+
assert_file_contains(project_path, "Dockerfile", "FROM python:3.13-slim")
102+
91103
@pytest.mark.slow
92104
def test_python_version_3_11(
93105
self,
@@ -119,6 +131,9 @@ def test_python_version_3_11(
119131
project_path, "pyproject.toml", 'requires-python = ">=3.11"'
120132
)
121133

134+
# Check Dockerfile has correct Python version
135+
assert_file_contains(project_path, "Dockerfile", "FROM python:3.11-slim")
136+
122137
@pytest.mark.slow
123138
def test_python_version_3_12(
124139
self,
@@ -150,6 +165,9 @@ def test_python_version_3_12(
150165
project_path, "pyproject.toml", 'requires-python = ">=3.12"'
151166
)
152167

168+
# Check Dockerfile has correct Python version
169+
assert_file_contains(project_path, "Dockerfile", "FROM python:3.12-slim")
170+
153171
@pytest.mark.slow
154172
def test_python_version_3_13(
155173
self,
@@ -181,6 +199,9 @@ def test_python_version_3_13(
181199
project_path, "pyproject.toml", 'requires-python = ">=3.13"'
182200
)
183201

202+
# Check Dockerfile has correct Python version
203+
assert_file_contains(project_path, "Dockerfile", "FROM python:3.13-slim")
204+
184205
@pytest.mark.slow
185206
def test_python_version_with_components(
186207
self,

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)