Revert "chore: update demo to the latest cookiecutter-robust-python"

This reverts commit 0dc4578.

Author: 56kyle

.cookiecutter.json

@@ -1,5 +1,5 @@
 {
-  "_commit": "3fe6276285c66293f418a38abcdb8785d8fe5012",
+  "_commit": "23c99cf2cbbcf6d9712b7c37f77844e6e964fe04",
   "_template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
   "add_rust_extension": false,
   "author": "Kyle Oliver",

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
-  "commit": "3fe6276285c66293f418a38abcdb8785d8fe5012",
+  "commit": "23c99cf2cbbcf6d9712b7c37f77844e6e964fe04",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -18,7 +18,7 @@
       "license": "MIT",
       "development_status": "Development Status :: 1 - Planning",
       "_template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
-      "_commit": "3fe6276285c66293f418a38abcdb8785d8fe5012"
+      "_commit": "23c99cf2cbbcf6d9712b7c37f77844e6e964fe04"
     }
   },
   "directory": null

noxfile.py

@@ -47,13 +47,13 @@
 RUST: str = "rust"
 
 
-@nox.session(python=False, name="setup-git", tags=[ENV])
+@nox.session(python=None, name="setup-git", tags=[ENV])
 def setup_git(session: Session) -> None:
     """Set up the git repo for the current project."""
     session.run("python", SCRIPTS_FOLDER / "setup-git.py", REPO_ROOT, external=True)
 
 
-@nox.session(python=False, name="setup-venv", tags=[ENV])
+@nox.session(python=None, name="setup-venv", tags=[ENV])
 def setup_venv(session: Session) -> None:
     """Set up the virtual environment for the current project."""
     session.run("python", SCRIPTS_FOLDER / "setup-venv.py", REPO_ROOT, "-p", PYTHON_VERSIONS[0], external=True)
@@ -72,14 +72,14 @@ def precommit(session: Session) -> None:
         activate_virtualenv_in_precommit_hooks(session)
 
 
-@nox.session(python=False, name="format-python", tags=[FORMAT, PYTHON])
+@nox.session(python=None, name="format-python", tags=[FORMAT, PYTHON])
 def format_python(session: Session) -> None:
     """Run Python code formatter (Ruff format)."""
     session.log(f"Running Ruff formatter check with py{session.python}.")
     session.run("uvx", "ruff", "format", *session.posargs)
 
 
-@nox.session(python=False, name="lint-python", tags=[LINT, PYTHON])
+@nox.session(python=None, name="lint-python", tags=[LINT, PYTHON])
 def lint_python(session: Session) -> None:
     """Run Python code linters (Ruff check, Pydocstyle rules)."""
     session.log(f"Running Ruff check with py{session.python}.")
@@ -96,7 +96,7 @@ def typecheck(session: Session) -> None:
     session.run("pyright", "--pythonversion", session.python)
 
 
-@nox.session(python=False, name="security-python", tags=[SECURITY, PYTHON, CI])
+@nox.session(python=None, name="security-python", tags=[SECURITY, PYTHON, CI])
 def security_python(session: Session) -> None:
     """Run code security checks (Bandit) on Python code."""
     session.log(f"Running Bandit static security analysis with py{session.python}.")
@@ -144,7 +144,7 @@ def docs_build(session: Session) -> None:
     session.run("sphinx-build", "-b", "html", "docs", str(docs_build_dir), "-W")
 
 
-@nox.session(python=False, name="build-python", tags=[BUILD, PYTHON])
+@nox.session(python=None, name="build-python", tags=[BUILD, PYTHON])
 def build_python(session: Session) -> None:
     """Build sdist and wheel packages (uv build)."""
     session.log(f"Building sdist and wheel packages with py{session.python}.")
@@ -154,7 +154,7 @@ def build_python(session: Session) -> None:
         session.log(f"- {path.name}")
 
 
-@nox.session(python=False, name="build-container", tags=[BUILD])
+@nox.session(python=None, name="build-container", tags=[BUILD])
 def build_container(session: Session) -> None:
     """Build the Docker container image.
 
@@ -204,20 +204,16 @@ def setup_release(session: Session) -> None:
     session.run("python", SCRIPTS_FOLDER / "setup-release.py", external=True)
 
 
-@nox.session(python=False, name="get-release-notes", tags=[RELEASE])
+@nox.session(python=None, name="get-release-notes", tags=[RELEASE])
 def get_release_notes(session: Session) -> None:
     """Gets the latest release notes if between bumping the version and tagging the release."""
     session.log("Getting release notes...")
-<<<<<<< ours
     session.install("-e", ".", "--group", "dev")
     session.install("typing_extensions")
     session.run("python", SCRIPTS_FOLDER / "get-release-notes.py", external=True)
-=======
-    session.run("python", SCRIPTS_FOLDER / "get-release-notes.py", *session.posargs, external=True)
->>>>>>> theirs
 
 
-@nox.session(python=False, tags=[RELEASE])
+@nox.session(python=None, tags=[RELEASE])
 def release(session: Session) -> None:
     """Run the release process using Commitizen.
 
@@ -252,7 +248,7 @@ def release(session: Session) -> None:
     session.log("IMPORTANT: Push commits and tags to remote (`git push --follow-tags`) to trigger CD pipeline.")
 
 
-@nox.session(python=False, name="publish-python", tags=[RELEASE])
+@nox.session(python=None, name="publish-python", tags=[RELEASE])
 def publish_python(session: Session) -> None:
     """Publish sdist and wheel packages to PyPI via uv publish.
 
@@ -266,7 +262,7 @@ def publish_python(session: Session) -> None:
     session.run("uv", "publish", "dist/*", *session.posargs, external=True)
 
 
-@nox.session(python=False)
+@nox.session(python=None)
 def tox(session: Session) -> None:
     """Run the 'tox' test matrix.
 

scripts/setup-release.py

@@ -26,11 +26,9 @@ def get_parser() -> argparse.ArgumentParser:
     )
     parser.add_argument(
         "increment",
-        nargs="?",
-        default=None,
         type=str,
         help="Increment type to use when preparing the release.",
-        choices=["MAJOR", "MINOR", "PATCH", "PRERELEASE"],
+        choices=["major", "minor", "patch", "prerelease"],
     )
     return parser