Skip to content

refactor: refine make prerequisites #887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2025
Merged

refactor: refine make prerequisites #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .renovaterc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
],
"matchStrings": [
"pip install.* (?<depName>.*?)(\\[.*?\\])?==(?<currentValue>.*?)[\"\n]",
"pipx install( --force)? (?<depName>.*?)(\\[.*?\\])?==(?<currentValue>.*?)\\s"
"pipx install( --force)? (?<depName>.*?)(\\[.*?\\])?==(?<currentValue>.*?)\\s",
"pipx list --short \\| grep -q \"(?<depName>.*?)(\\[.*?\\])? (?<currentValue>.*?)\""
]
},
{
Expand Down
17 changes: 9 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,14 @@ lock:

# Install standalone tools
prerequisites:
pipx install --force check-jsonschema==0.31.0
pipx install --force codespell[toml]==2.4.1
pipx install --force pdm==2.22.3
pipx install --force pre-commit==4.1.0
pipx install --force pyproject-fmt==2.5.0
pipx install --force ruff==0.9.3
pipx install --force watchfiles==1.0.4
pipx list --short | grep -q "check-jsonschema 0.31.0" || pipx install --force check-jsonschema==0.31.0
pipx list --short | grep -q "codespell 2.4.1" || pipx install --force codespell[toml]==2.4.1
pipx list --short | grep -q "copier 9.4.1" || pipx install --force copier==9.4.1
pipx list --short | grep -q "pdm 2.22.3" || pipx install --force pdm==2.22.3
pipx list --short | grep -q "pre-commit 4.1.0" || pipx install --force pre-commit==4.1.0
pipx list --short | grep -q "pyproject-fmt 2.5.0" || pipx install --force pyproject-fmt==2.5.0
pipx list --short | grep -q "ruff 0.9.3" || pipx install --force ruff==0.9.3
pipx list --short | grep -q "watchfiles 1.0.4" || pipx install --force watchfiles==1.0.4

########################################################################################
# Lint and pre-commit
Expand Down Expand Up @@ -98,7 +99,7 @@ check-jsonschema:
check-jsonschema --builtin-schema vendor.github-workflows .github/workflows/*.yml
check-jsonschema --builtin-schema vendor.gitlab-ci --data-transform gitlab-ci --regex-variant nonunicode .gitlab-ci.yml .gitlab/workflows/*.yml
check-jsonschema --builtin-schema vendor.readthedocs .readthedocs.yaml
check-jsonschema --builtin-schema vendor.renovate .renovaterc.json
check-jsonschema --builtin-schema vendor.renovate --regex-variant nonunicode .renovaterc.json

# Check lint with all linters.
lint: mypy ruff ruff-format pyproject-fmt codespell check-jsonschema
Expand Down
3 changes: 2 additions & 1 deletion template/.renovaterc.json.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
],
"matchStrings": [
"pip install.* (?<depName>.*?)(\\[.*?\\])?==(?<currentValue>.*?)[\"\n]",
"pipx install( --force)? (?<depName>.*?)(\\[.*?\\])?==(?<currentValue>.*?)\\s"
"pipx install( --force)? (?<depName>.*?)(\\[.*?\\])?==(?<currentValue>.*?)\\s",
"pipx list --short \\| grep -q \"(?<depName>.*?)(\\[.*?\\])? (?<currentValue>.*?)\""
]
},
{
Expand Down
19 changes: 11 additions & 8 deletions template/Makefile.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,16 @@ lock:

# Install standalone tools
prerequisites:
pipx install --force check-jsonschema==0.31.0
pipx install --force codespell[toml]==2.4.1
pipx install --force pdm==2.22.3
pipx install --force pre-commit==4.1.0
pipx install --force pyproject-fmt==2.5.0
pipx install --force ruff==0.9.3
pipx install --force watchfiles==1.0.4
pipx list --short | grep -q "check-jsonschema 0.31.0" || pipx install --force check-jsonschema==0.31.0
pipx list --short | grep -q "codespell 2.4.1" || pipx install --force codespell[toml]==2.4.1
{% if project_name == "Serious Scaffold Python" %}
pipx list --short | grep -q "copier 9.4.1" || pipx install --force copier==9.4.1
{% endif %}
pipx list --short | grep -q "pdm 2.22.3" || pipx install --force pdm==2.22.3
pipx list --short | grep -q "pre-commit 4.1.0" || pipx install --force pre-commit==4.1.0
pipx list --short | grep -q "pyproject-fmt 2.5.0" || pipx install --force pyproject-fmt==2.5.0
pipx list --short | grep -q "ruff 0.9.3" || pipx install --force ruff==0.9.3
pipx list --short | grep -q "watchfiles 1.0.4" || pipx install --force watchfiles==1.0.4

########################################################################################
# Lint and pre-commit
Expand Down Expand Up @@ -106,7 +109,7 @@ check-jsonschema:
check-jsonschema --builtin-schema vendor.gitlab-ci --data-transform gitlab-ci --regex-variant nonunicode .gitlab-ci.yml .gitlab/workflows/*.yml
{% endif %}
check-jsonschema --builtin-schema vendor.readthedocs .readthedocs.yaml
check-jsonschema --builtin-schema vendor.renovate .renovaterc.json
check-jsonschema --builtin-schema vendor.renovate --regex-variant nonunicode .renovaterc.json

# Check lint with all linters.
lint: mypy ruff ruff-format pyproject-fmt codespell check-jsonschema
Expand Down