Skip to content

Commit 345fdd5

Browse files
committed
chore: bulk update to try adding back in cruft
1 parent 3ef4e9c commit 345fdd5

File tree

6 files changed

+139
-110
lines changed

6 files changed

+139
-110
lines changed

.cookiecutter.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"_checkout": null,
3-
"_output_dir": "C:\\Users\\56kyl\\source\\repos",
4-
"_repo_dir": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
2+
"_commit": "12b6d5e45480e610046955a3570aaaedc77a1af6",
53
"_template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
64
"add_rust_extension": false,
75
"author": "Kyle Oliver",

.cruft.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
3+
"commit": "12b6d5e45480e610046955a3570aaaedc77a1af6",
4+
"checkout": null,
5+
"context": {
6+
"cookiecutter": {
7+
"project_name": "robust-python-demo",
8+
"package_name": "robust_python_demo",
9+
"friendly_name": "Robust Python Demo",
10+
"min_python_version": "3.9",
11+
"max_python_version": "3.13",
12+
"add_rust_extension": false,
13+
"author": "Kyle Oliver",
14+
"email": "56kyleoliver+cookiecutter-robust-python@gmail.com",
15+
"github_user": "56kyle",
16+
"version": "0.0.0",
17+
"copyright_year": "2025",
18+
"license": "MIT",
19+
"development_status": "Development Status :: 1 - Planning",
20+
"_template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
21+
"_commit": "12b6d5e45480e610046955a3570aaaedc77a1af6"
22+
}
23+
},
24+
"directory": null
25+
}

.editorconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ end_of_line = lf
66
insert_final_newline = true
77
trim_trailing_whitespace = true
88
max_line_length = 120
9-
tab_width = 4
10-
ij_continuation_indent_size = 8
119
ij_formatter_off_tag = @formatter:off
1210
ij_formatter_on_tag = @formatter:on
1311
ij_formatter_tags_enabled = true
@@ -19,7 +17,7 @@ ij_wrap_on_typing = false
1917
indent_style = space
2018
indent_size = 4
2119

22-
[*.yml,yaml,json]
20+
[{*.yml,*.yaml,*.json}]
2321
indent_style = space
2422
indent_size = 2
2523

.github/workflows/test-python.yml

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,62 @@
44
name: Test Python Code
55

66
on:
7-
pull_request:
8-
paths:
9-
- "src/**/*.py"
10-
- "tests/**/*.py"
11-
- "noxfile.py"
12-
- "pyproject.toml"
13-
- ".coveragerc"
14-
- ".github/workflows/test-python.yml"
15-
push:
16-
branches:
17-
- main
18-
- master
19-
paths:
20-
- "src/**/*.py"
21-
- "tests/**/*.py"
22-
- "noxfile.py"
23-
- "pyproject.toml"
24-
- ".coveragerc"
25-
- ".github/workflows/test-python.yml"
7+
pull_request:
8+
paths:
9+
- "src/**/*.py"
10+
- "tests/**/*.py"
11+
- "noxfile.py"
12+
- "pyproject.toml"
13+
- ".coveragerc"
14+
- ".github/workflows/test-python.yml"
15+
push:
16+
branches:
17+
- main
18+
- master
19+
paths:
20+
- "src/**/*.py"
21+
- "tests/**/*.py"
22+
- "noxfile.py"
23+
- "pyproject.toml"
24+
- ".coveragerc"
25+
- ".github/workflows/test-python.yml"
2626

27-
workflow_dispatch:
27+
workflow_dispatch:
2828

2929
jobs:
30-
test-python:
31-
name: Run Python Tests on ${{ matrix.os }}/${{ matrix.python-version }}
32-
runs-on: ${{ matrix.os }}
33-
strategy:
34-
matrix:
35-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
36-
os: [ubuntu-latest, windows-latest, macos-latest]
30+
test-python:
31+
name: Run Python Tests on ${{ matrix.os }}/${{ matrix.python-version }}
32+
runs-on: ${{ matrix.os }}
33+
strategy:
34+
matrix:
35+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
36+
os: [ubuntu-latest, windows-latest, macos-latest]
3737

38-
steps:
39-
- name: Checkout code
40-
uses: actions/checkout@v4
38+
steps:
39+
- name: Checkout code
40+
uses: actions/checkout@v4
4141

42-
- name: Install uv
43-
uses: astral-sh/setup-uv@v6
42+
- name: Install uv
43+
uses: astral-sh/setup-uv@v6
4444

45-
- name: Set up Python
46-
uses: actions/setup-python@v5
47-
with:
48-
python-version: ${{ matrix.python-version }}
45+
- name: Set up Python
46+
uses: actions/setup-python@v5
47+
with:
48+
python-version: ${{ matrix.python-version }}
4949

50-
- name: Run test suite
51-
run: uvx nox -s test-python
50+
- name: Run test suite
51+
run: uvx nox -s test-python
5252

53-
- name: Upload test reports
54-
uses: actions/upload-artifact@v4
55-
with:
56-
name: test-results-${{ matrix.os }}-py${{ matrix.python-version }}
57-
path: tests/results/*.xml
58-
retention-days: 5
53+
- name: Upload test reports
54+
uses: actions/upload-artifact@v4
55+
with:
56+
name: test-results-${{ matrix.os }}-py${{ matrix.python-version }}
57+
path: tests/results/*.xml
58+
retention-days: 5
5959

60-
- name: Upload coverage report
61-
uses: actions/upload-artifact@v4
62-
with:
63-
name: coverage-report-${{ matrix.os }}-py${{ matrix.python-version }}
64-
path: coverage.xml
65-
retention-days: 5
60+
- name: Upload coverage report
61+
uses: actions/upload-artifact@v4
62+
with:
63+
name: coverage-report-${{ matrix.os }}-py${{ matrix.python-version }}
64+
path: coverage.xml
65+
retention-days: 5

.pre-commit-config.yaml

Lines changed: 60 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,68 @@
33
default_stages: [pre-commit]
44

55
repos:
6-
- repo: local
7-
hooks:
8-
- id: check-added-large-files
9-
name: Check for added large files
10-
entry: check-added-large-files
11-
language: system
12-
- id: check-toml
13-
name: Check Toml
14-
entry: check-toml
15-
language: system
16-
types: [toml]
17-
- id: check-yaml
18-
name: Check Yaml
19-
entry: check-yaml
20-
language: system
21-
types: [yaml]
22-
- id: end-of-file-fixer
23-
name: Fix End of Files
24-
entry: end-of-file-fixer
25-
language: system
26-
types: [text]
27-
stages: [pre-commit, pre-push, manual]
28-
- id: trailing-whitespace
29-
name: Trim Trailing Whitespace
30-
entry: trailing-whitespace-fixer
31-
language: system
32-
types: [text]
33-
stages: [pre-commit, pre-push, manual]
6+
- repo: local
7+
hooks:
8+
- id: check-added-large-files
9+
name: Check for added large files
10+
entry: check-added-large-files
11+
language: system
12+
- id: check-toml
13+
name: Check Toml
14+
entry: check-toml
15+
language: system
16+
types: [toml]
17+
- id: check-yaml
18+
name: Check Yaml
19+
entry: check-yaml
20+
language: system
21+
types: [yaml]
22+
- id: end-of-file-fixer
23+
name: Fix End of Files
24+
entry: end-of-file-fixer
25+
language: system
26+
types: [text]
27+
stages: [pre-commit, pre-push, manual]
28+
- id: trailing-whitespace
29+
name: Trim Trailing Whitespace
30+
entry: trailing-whitespace-fixer
31+
language: system
32+
types: [text]
33+
stages: [pre-commit, pre-push, manual]
3434

35-
- repo: https://github.com/astral-sh/ruff-pre-commit
36-
rev: v0.12.0
37-
hooks:
38-
- id: ruff-format
39-
args: [--config=.ruff.toml]
35+
- repo: https://github.com/astral-sh/ruff-pre-commit
36+
rev: v0.11.11
37+
hooks:
38+
- id: ruff-format
39+
args: [--config=.ruff.toml]
40+
name: Ruff Format
4041

41-
- id: ruff-check
42-
args: [--fix, --diff, --exit-non-zero-on-fix, --config=.ruff.toml]
42+
- id: ruff-check
43+
args: [--fix, --diff, --exit-non-zero-on-fix, --config=.ruff.toml]
44+
name: Ruff Check
4345

44-
- repo: https://github.com/doublify/pre-commit-rust
45-
rev: v1.0
46-
hooks:
47-
- id: fmt
48-
- id: clippy
49-
args: ["--all-features", "--", "--write"]
50-
- id: cargo-check
46+
- repo: https://github.com/doublify/pre-commit-rust
47+
rev: master
48+
hooks:
49+
- id: fmt
50+
name: Rust Format
51+
- id: clippy
52+
args: ["--all-features", "--", "--write"]
53+
name: Clippy
54+
- id: cargo-check
55+
name: Cargo Check
5156

52-
- repo: https://github.com/pre-commit/mirrors-prettier
53-
rev: v4.0.0-alpha.8
54-
hooks:
55-
- id: prettier
57+
- repo: https://github.com/pre-commit/mirrors-prettier
58+
rev: v2.6.0
59+
hooks:
60+
- id: prettier
61+
name: Prettier
5662

57-
- repo: https://github.com/commitizen-tools/commitizen
58-
rev: v4.8.3
59-
hooks:
60-
- id: commitizen
61-
- id: commitizen-branch
62-
stages: [commit-msg]
63+
- repo: https://github.com/commitizen-tools/commitizen
64+
rev: v4.8.2
65+
hooks:
66+
- id: commitizen
67+
name: Commitizen
68+
- id: commitizen-branch
69+
name: Commitizen Branch
70+
stages: [commit-msg]

noxfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def setup_venv(session: Session) -> None:
6262
@nox.session(python=DEFAULT_PYTHON_VERSION, name="pre-commit", tags=[CI])
6363
def precommit(session: Session) -> None:
6464
"""Lint using pre-commit."""
65-
args: list[str] = session.posargs or ["run", "--all-files", "--hook-stage=manual", "--show-diff-on-failure"]
65+
args: list[str] = session.posargs or ["run", "--all-files", "--show-diff-on-failure"]
6666

6767
session.log("Installing pre-commit dependencies...")
6868
session.install("-e", ".", "--group", "dev")
@@ -124,7 +124,7 @@ def tests_python(session: Session) -> None:
124124
"--cov-report=term",
125125
"--cov-report=xml",
126126
f"--junitxml={junitxml_file}",
127-
"tests/"
127+
"tests/",
128128
)
129129

130130

0 commit comments

Comments
 (0)