Skip to content

Commit e9eac6b

Browse files
authored
Merge pull request #1 from PovertyAction/template-updates-july2025
updates to template files
2 parents f52d0b2 + b4f6691 commit e9eac6b

File tree

7 files changed

+1075
-704
lines changed

7 files changed

+1075
-704
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
## Checklist ✅
2424

2525
- [ ] I have run and tested my changes locally
26-
- [ ] I have limit this PR to less than 1000 lines of code change (if not, explain why)
26+
- [ ] I have limited this PR to less than 1000 lines of code change (if not, explain why)
2727
- [ ] I have updated/added tests to cover my changes (if applicable)
2828
- [ ] I have updated/added requirements to cover my changes (if applicable)
2929
- [ ] I have run linting and formatting on any code changes (if applicable)
3030
- [ ] I have updated the documentation (README, etc.) accordingly
31-
- [ ] I have reviewed and resolved any merge conflict
3231

3332
## Reviewer Emoji Legend
3433

.github/workflows/pre-commit.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: actions/setup-python@v5
13+
- name: Install uv and set the python version
14+
uses: astral-sh/setup-uv@v6
15+
with:
16+
python-version: '3.12'
17+
enable-cache: true
18+
cache-dependency-glob: "uv.lock"
19+
- name: Sync uv
20+
run: uv sync --locked --all-extras --dev
1421
- uses: pre-commit/[email protected]

.pre-commit-config.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.6.0
3+
rev: v5.0.0
44
hooks:
55
- id: check-yaml
6-
stages: [commit]
6+
stages: [pre-commit]
77
- id: check-json
8-
stages: [commit]
8+
stages: [pre-commit]
99
exclude: ^\.devcontainer/devcontainer\.json$
1010
- id: check-toml
11-
stages: [commit]
11+
stages: [pre-commit]
1212
- id: check-merge-conflict
13-
stages: [commit]
13+
stages: [pre-commit]
1414

1515
- repo: https://github.com/abravalheri/validate-pyproject
16-
rev: v0.19
16+
rev: v0.24.1
1717
hooks:
1818
- id: validate-pyproject
1919

20+
- repo: https://github.com/codespell-project/codespell
21+
rev: v2.4.1
22+
hooks:
23+
- id: codespell
24+
2025
- repo: https://github.com/igorshubovych/markdownlint-cli
21-
rev: v0.41.0
26+
rev: v0.45.0
2227
hooks:
2328
- id: markdownlint-fix
2429

2530
- repo: https://github.com/astral-sh/ruff-pre-commit
26-
rev: v0.6.4
31+
rev: v0.12.2
2732
hooks:
28-
- id: ruff-format
29-
types_or: [python, pyi, jupyter]
30-
- id: ruff
33+
- id: ruff-check
3134
args: [--fix, --exit-non-zero-on-fix]
3235
types_or: [python, pyi, jupyter]
3336
require_serial: true
34-
35-
- repo: https://github.com/crate-ci/typos
36-
rev: v1.24.5
37-
hooks:
38-
- id: typos
37+
- id: ruff-format
38+
types_or: [python, pyi, jupyter]

.vscode/extensions.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
{
22
"recommendations": [
33
"ms-python.python",
4-
"charliermarsh.ruff",
54
"ms-toolsai.jupyter",
5+
"ms-python.vscode-python-envs",
6+
"charliermarsh.ruff",
67
"github.vscode-pull-request-github",
78
"davidanson.vscode-markdownlint",
8-
"donjayamanne.python-environment-manager"
9+
"quarto.quarto",
10+
"skellock.just",
11+
"yzhang.markdown-all-in-one",
12+
"redhat.vscode-yaml"
913
]
1014
}

Justfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ system-info:
1414
@echo "CPU architecture: {{ arch() }}"
1515
@echo "Operating system type: {{ os_family() }}"
1616
@echo "Operating system: {{ os() }}"
17-
@echo "Home directory: {{ home_directory() }}"
1817

1918
# Clean venv
2019
clean:
@@ -32,7 +31,7 @@ update-reqs:
3231
venv:
3332
uv sync
3433
uv tool install pre-commit
35-
pre-commit install
34+
uv run pre-commit install
3635

3736
activate-venv:
3837
uv shell
@@ -85,15 +84,14 @@ pre-commit-run:
8584

8685
[windows]
8786
pre-install:
88-
winget install Casey.Just astral-sh.uv GitHub.cli Posit.Quarto
87+
winget install Casey.Just astral-sh.uv GitHub.cli Posit.Quarto OpenJS.NodeJS
88+
npm install -g markdownlint-cli
8989

9090
[linux]
9191
pre-install:
92-
brew install just uv gh
93-
curl -sfL https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.54/quarto-1.5.54-linux-amd64.deb | sudo apt install ./quarto-1.5.54-linux-amd64.deb
94-
rm quarto-1.5.54-linux-amd64.deb
92+
brew install just uv gh markdownlint-cli
9593

9694
[macos]
9795
pre-install:
98-
brew install just uv gh
96+
brew install just uv gh markdownlint-cli
9997
brew install --cask quarto

pyproject.toml

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
[project]
2-
name = "dms-dashboard"
2+
name = "project-name"
33
version = "0.1.0"
4-
description = "IPA Data Management System Dashboard."
4+
description = "Project description"
55
readme = "README.md"
66
requires-python = ">=3.12"
77
dependencies = [
8-
"mdformat>=0.7.17",
9-
"mdformat-config>=0.1.3",
10-
"mdformat-frontmatter>=2.0.8",
11-
"mdformat-gfm>=0.3.6",
12-
"mdformat-pyproject>=0.0.1",
13-
"ruff>=0.6.4",
8+
"duckdb>=1.1.3",
9+
"great-tables>=0.15.0",
1410
"ipykernel>=6.29.5",
15-
"jupyterlab>=4.2.5",
16-
"sqlfluff>=3.1.1",
11+
"jupyter>=1.1.1",
12+
"jupytext>=1.17.2",
13+
"pandas>=2.2.3",
14+
"polars>=1.17.1",
15+
"seaborn>=0.13.2",
1716
]
1817

1918

19+
[tool.uv]
20+
dev-dependencies = [
21+
"codespell>=2.4.1",
22+
"pre-commit>=4.2.0",
23+
"ruff>=0.7.4",
24+
]
25+
2026
[tool.ruff]
2127
line-length = 88
2228
fix = true
23-
# Assume Python 3.11
24-
target-version = "py311"
29+
# Assume Python 3.12
30+
target-version = "py312"
2531

2632
[tool.ruff.lint]
2733
# docs: https://docs.astral.sh/ruff/rules/
@@ -59,8 +65,7 @@ ignore = [
5965
docstring-code-format = true
6066
docstring-code-line-length = 88
6167

62-
[tool.mdformat]
63-
# docs: https://mdformat.readthedocs.io/en/stable/users/configuration_file.html
64-
wrap = 88 # possible values: {"keep", "no", INTEGER}
65-
number = false # possible values: {false, true}
66-
end_of_line = "lf" # possible values: {"lf", "crlf", "keep"}
68+
[tool.codespell]
69+
builtin = "clear,rare,informal,usage,code,names"
70+
ignore-words-list = "jupyter,ipa"
71+
skip = "uv.lock"

0 commit comments

Comments
 (0)