Merge pull request #48 from robust-python/develop

Update to Python 3.10-3.14 along with other fixes

Author: 56kyle

.readthedocs.yml

@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.13"
+    python: "3.14"
 
 python:
   install:

.ruff.toml

@@ -35,8 +35,8 @@ exclude = [
 line-length = 120
 indent-width = 4
 
-# Assume Python 3.9
-target-version = "py39"
+# Assume Python 3.10
+target-version = "py310"
 
 [lint]
 # https://docs.astral.sh/ruff/rules

cookiecutter.json

@@ -2,8 +2,8 @@
   "project_name": "robust-python-demo",
   "package_name": "{{ cookiecutter.project_name.replace('-', '_') }}",
   "friendly_name": "{{ cookiecutter.project_name.replace('-', ' ').title() }}",
-  "min_python_version": "3.9",
-  "max_python_version": "3.13",
+  "min_python_version": "3.10",
+  "max_python_version": "3.14",
   "add_rust_extension": false,
   "author": "First Last",
   "email": "cookiecutter.robust.python@gmail.com",

docs/getting-started-template-contributing.md

@@ -7,7 +7,7 @@ This section is for contributors looking to work on the `cookiecutter-robust-pyt
 To contribute to the template, you will need:
 
 1.  **Git**: For version control.
-2.  **Python 3.9+**: We recommend using a supported Python version.
+2.  **Python 3.10+**: We recommend using a supported Python version.
 3.  **uv**: Our chosen dependency manager (see [Dependency Management (02)](topics/02_dependency-management.md)). Install `uv` globally or in a base environment following the official {uv-install}`uv installation guide<>`.
 4.  **Docker or Podman**: Required for testing the containerization aspects of the generated template (see [Container Build (11)](topics/11_container-build.md), [Dev Containers (17)](topics/17_dev-containers.md)).
 5.  **Task Automation Tools**: The template uses `noxfile.py` for development workflows. We use `uvx` to run `nox` so that it automatically installs if needed.

docs/quickstart.md

@@ -10,7 +10,7 @@ For detailed tool explanations and project philosophy, see the full documentatio
 
 Make sure you have these installed:
 
-- **Python 3.9+** (or your chosen template version).
+- **Python 3.10+** (or your chosen template version).
 - **Git**.
 - **uv**: Our chosen dependency manager. Install it {uv-install}`officially<>`.
 - **Docker or Podman**: If you plan to work with containers (most web apps will need this). Install {docker-install}`Docker<>` or {podman-install}`Podman<>`.

noxfile.py

@@ -17,7 +17,7 @@
 
 nox.options.default_venv_backend = "uv"
 
-DEFAULT_TEMPLATE_PYTHON_VERSION = "3.9"
+DEFAULT_TEMPLATE_PYTHON_VERSION = "3.10"
 
 REPO_ROOT: Path = Path(__file__).parent.resolve()
 SCRIPTS_FOLDER: Path = REPO_ROOT / "scripts"
@@ -59,7 +59,11 @@
 LINT_FROM_DEMO_OPTIONS: tuple[str, ...] = GENERATE_DEMO_OPTIONS
 
 UPDATE_DEMO_SCRIPT: Path = SCRIPTS_FOLDER / "update-demo.py"
-UPDATE_DEMO_OPTIONS: tuple[str, ...] = GENERATE_DEMO_OPTIONS
+UPDATE_DEMO_OPTIONS: tuple[str, ...] = (
+    *GENERATE_DEMO_OPTIONS,
+    *("--min-python-version", "3.10"),
+    *("--max-python-version", "3.14")
+)
 
 
 @nox.session(python=DEFAULT_TEMPLATE_PYTHON_VERSION, name="generate-demo")

pyproject.toml

@@ -3,7 +3,7 @@ name = "cookiecutter-robust-python"
 version = "0.1.0"
 description = "Add your description here"
 readme = "README.md"
-requires-python = ">=3.9,<4.0"
+requires-python = ">=3.10,<4.0"
 dependencies = [
     "cookiecutter>=2.6.0",
     "cruft>=2.16.0",

scripts/update-demo.py

@@ -12,6 +12,7 @@
 from util import FolderOption
 from util import REPO_FOLDER
 from util import require_clean_and_up_to_date_repo
+from util import uv
 
 
 cli: typer.Typer = typer.Typer()
@@ -20,7 +21,9 @@
 @cli.callback(invoke_without_command=True)
 def update_demo(
     demos_cache_folder: Annotated[Path, FolderOption("--demos-cache-folder", "-c")],
-    add_rust_extension: Annotated[bool, typer.Option("--add-rust-extension", "-r")] = False
+    add_rust_extension: Annotated[bool, typer.Option("--add-rust-extension", "-r")] = False,
+    min_python_version: Annotated[str, typer.Option("--min-python-version")] = "3.10",
+    max_python_version: Annotated[str, typer.Option("--max-python-version")] = "3.14"
 ) -> None:
     """Runs precommit in a generated project and matches the template to the results."""
     try:
@@ -31,11 +34,19 @@ def update_demo(
         with work_in(demo_path):
             require_clean_and_up_to_date_repo()
             git("checkout", develop_branch)
+            uv("python", "pin", min_python_version)
+            uv("python", "install", min_python_version)
             cruft.update(
                 project_dir=demo_path,
                 template_path=REPO_FOLDER,
-                extra_context={"project_name": demo_name, "add_rust_extension": add_rust_extension},
+                extra_context={
+                    "project_name": demo_name,
+                    "add_rust_extension": add_rust_extension,
+                    "min_python_version": min_python_version,
+                    "max_python_version": max_python_version
+                },
             )
+            uv("lock")
             git("add", ".")
             git("commit", "-m", "chore: update demo to the latest cookiecutter-robust-python", "--no-verify")
             git("push")