Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cookiecutter.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_commit": "b36862f08dac62022ba33f94c31be4bac4181340",
"_commit": "a2d5945a169185d37abe3b1eaad1871ece5d9eec",
"_max_python_version_minor_int": 14,
"_min_python_version_minor_int": 10,
"_template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
Expand Down
4 changes: 2 additions & 2 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
"commit": "b36862f08dac62022ba33f94c31be4bac4181340",
"commit": "a2d5945a169185d37abe3b1eaad1871ece5d9eec",
"checkout": null,
"context": {
"cookiecutter": {
Expand All @@ -20,7 +20,7 @@
"license": "MIT",
"development_status": "Development Status :: 1 - Planning",
"_template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
"_commit": "b36862f08dac62022ba33f94c31be4bac4181340",
"_commit": "a2d5945a169185d37abe3b1eaad1871ece5d9eec",
"_min_python_version_minor_int": 10,
"_max_python_version_minor_int": 14,
"python_versions": [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- "pyproject.toml"
- ".github/workflows/build-docs.yml"
- ".ruff.toml" # Affects docstrings via linting
- "pyrightconfig.json" # Affects type hints in docs
- "pyrightconfig.json" # Basedpyright config - affects type hints in docs

push:
branches:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ Thumbs.db # Windows thumbnail cache
# MyPy cache (if used standalone or by IDE)
.mypy_cache/

# Pyright cache
# Pyright/Basedpyright cache
.pyright/
.basedpyright/

# Ruff cache
.ruff_cache/
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ms-python.python",
"ms-python.vscode-pylance",
"charliermarsh.ruff",
"ms-pyright.pyright",
"detachhead.basedpyright",

// Git + pre-commit workflow
"ryanluker.vscode-pre-commit",
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ruff.args": ["--config", "${workspaceFolder}/.ruff.toml"],
"python.linting.enabled": true,
"python.linting.ruffEnabled": true,
// Pyright
// Basedpyright
"python.analysis.typeCheckingMode": "basic",

// Pytest
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## v0.34.0 (2025-11-24)

## v0.33.0 (2025-11-17)

## v0.32.0 (2025-11-17)
Expand Down
5 changes: 3 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ This project follows these standards:

- **Code formatting:** [Ruff][ruff-documentation] (automatically applied by pre-commit)
- **Linting:** Ruff with comprehensive rule set
- **Type checking:** [Pyright][pyright-documentation]
- **Type checking:** [Basedpyright][basedpyright-documentation]
- **Security:** [Bandit][bandit-documentation] for security linting
- **Commit messages:** [Conventional Commits][conventional-commits] format preferred
- **Testing:** [pytest][pytest-documentation] with good coverage
Expand Down Expand Up @@ -168,7 +168,7 @@ Common Nox sessions for development:
# Code quality
uvx nox -s format-python # Format with Ruff
uvx nox -s lint-python # Lint with Ruff
uvx nox -s typecheck # Type check with Pyright
uvx nox -s typecheck # Type check with Basedpyright
uvx nox -s security-python # Security checks

# Testing
Expand Down Expand Up @@ -206,6 +206,7 @@ _This project was generated from the [cookiecutter-robust-python][cookiecutter-r
[discussions]: https://github.com/56kyle/robust-python-demo/discussions
[uv-documentation]: https://docs.astral.sh/uv/
[ruff-documentation]: https://docs.astral.sh/ruff/
[basedpyright-documentation]: https://github.com/detachhead/basedpyright
[pyright-documentation]: https://github.com/microsoft/pyright
[bandit-documentation]: https://bandit.readthedocs.io/
[conventional-commits]: https://www.conventionalcommits.org/
Expand Down
12 changes: 3 additions & 9 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,7 @@
nox.options.default_venv_backend = "uv"
os.environ.setdefault("PYO3_USE_ABI3_FORWARD_COMPATIBILITY", "1")

# Logic that helps avoid metaprogramming in cookiecutter-robust-python
MIN_PYTHON_VERSION_SLUG: int = int("3.10".lstrip("3."))
MAX_PYTHON_VERSION_SLUG: int = int("3.14".lstrip("3."))

PYTHON_VERSIONS: List[str] = [
f"3.{VERSION_SLUG}" for VERSION_SLUG in range(MIN_PYTHON_VERSION_SLUG, MAX_PYTHON_VERSION_SLUG + 1)
]
PYTHON_VERSIONS: List[str] = ['3.10', '3.11', '3.12', '3.13', '3.14']
DEFAULT_PYTHON_VERSION: str = PYTHON_VERSIONS[-1]

REPO_ROOT: Path = Path(__file__).parent.resolve()
Expand Down Expand Up @@ -102,11 +96,11 @@ def lint_python(session: Session) -> None:

@nox.session(python=PYTHON_VERSIONS, name="typecheck")
def typecheck(session: Session) -> None:
"""Run static type checking (Pyright) on Python code."""
"""Run static type checking (Basedpyright) on Python code."""
session.log("Installing type checking dependencies...")
session.install("-e", ".", "--group", "dev")

session.log(f"Running Pyright check with py{session.python}.")
session.log(f"Running Basedpyright check with py{session.python}.")
session.run("pyright", "--pythonversion", session.python)


Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "robust-python-demo"
version = "0.33.0"
version = "0.34.0"
description = "robust-python-demo"
authors = [
{ name = "Kyle Oliver", email = "56kyleoliver+cookiecutter-robust-python@gmail.com" },
Expand Down Expand Up @@ -41,7 +41,7 @@ dev = [
"pip-audit>=2.9.0",
"pytest>=8.3.5",
"pytest-cov>=6.1.1",
"pyright>=1.1.400",
"basedpyright>=1.34.0",
]
docs = [
"furo>=2024.8.6",
Expand Down
6 changes: 4 additions & 2 deletions pyrightconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@
"reportPropertyTypeMismatch": "warning",
"reportReturnTypeFromAnnotation": "warning",
"reportMissingReturnType": "warning",
"basic": true,
"reportMissingParameterType": "warning",
"reportOptionalOperand": "warning",
"pythonVersion": "3.10"
"pythonVersion": "3.10",

"reportAny": "error",
"reportExplicitAny": "warning"
}
47 changes: 31 additions & 16 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading