Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Oct 14, 2024
1 parent 0ca9d55 commit f114f29
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 13 deletions.
1 change: 1 addition & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"*particle*.*ml",
".editorconfig",
".envrc",
".gitattributes",
".gitignore",
".pre-commit-config.yaml",
".prettierignore",
Expand Down
12 changes: 10 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
uv sync --all-extras --quiet
source .venv/bin/activate
if [ -e .venv ]; then
source .venv/bin/activate
elif [ -e venv ]; then
source venv/bin/activate
elif [ -e .pixi ]; then
watch_file pixi.lock
eval "$(pixi shell-hook)"
else
layout anaconda
fi
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- package-name
permissions:
id-token: write
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
steps:
- uses: ComPWA/actions/build-pypi-distribution@v1
- uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
id-token: write
with:
apt-packages: graphviz
python-version: "3.9"
specific-pip-packages: ${{ inputs.specific-pip-packages }}
pytest:
uses: ComPWA/actions/.github/workflows/pytest.yml@v1
Expand All @@ -48,5 +47,3 @@ jobs:
secrets:
token: ${{ secrets.PAT }}
uses: ComPWA/actions/.github/workflows/pre-commit.yml@v1
with:
python-version: "3.9"
2 changes: 1 addition & 1 deletion .github/workflows/clean-caches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
cleanup:
name: Remove caches
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
steps:
- uses: ComPWA/actions/clean-caches@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
update_release_draft:
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
steps:
- uses: release-drafter/release-drafter@v6
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ pyvenv*/
!.zenodo.json
!codecov.yml
!pyrightconfig.json
.pixi/
7 changes: 5 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
ci:
autoupdate_commit_msg: "MAINT: update lock files"
autoupdate_commit_msg: "MAINT: autoupdate pre-commit hooks"
autoupdate_schedule: quarterly # already done by requirements-cron.yml
skip:
- check-jsonschema
- mypy
- pyright
- uv-lock

repos:
- repo: meta
Expand Down Expand Up @@ -149,6 +148,10 @@ repos:
types:
- python

- repo: https://github.com/ComPWA/mirrors-pyright
rev: PLEASE-UPDATE
hooks:
- id: pyright
- repo: https://github.com/ComPWA/pyright-pre-commit
rev: v1.1.384
hooks:
Expand Down
3 changes: 2 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
version: 2

build:
os: ubuntu-24.04
os: ubuntu-22.04
tools:
python: "3.9"
apt_packages:
- graphviz
jobs:
post_install:
- python -m pip install 'uv>=0.2.0'
- python -m uv pip install -e .[doc]
- python -m uv sync --extra=doc
formats:
- htmlzip
Expand Down
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@
"[yaml]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cSpell.enabled": true,
"coverage-gutters.coverageFileNames": ["coverage.xml"],
"coverage-gutters.coverageReportFileName": "**/htmlcov/index.html",
"coverage-gutters.showGutterCoverage": false,
"coverage-gutters.showLineCoverage": true,
"cSpell.enabled": true,
"diffEditor.experimental.showMoves": true,
"editor.formatOnSave": true,
"files.associations": {
"**/pixi.lock": "yaml"
},
"files.watcherExclude": {
"**/*_cache/**": true,
"**/.eggs/**": true,
Expand Down
24 changes: 23 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ where = ["src"]

[tool.setuptools_scm]
local_scheme = "no-local-version"
version_scheme = "only-version"
version_scheme = "post-release"
write_to = "src/qrules/version.py"

[tool.coverage.run]
Expand Down Expand Up @@ -197,6 +197,28 @@ module = ["sphinx.*"]
ignore_missing_imports = true
module = ["tqdm.*"]

[tool.pixi.project]
channels = ["conda-forge"]
platforms = ["linux-64"]

[tool.pixi.dependencies]
python = "3.9.*"

[tool.pixi.environments]
default = {features = [
"all",
"dev",
"doc",
"jupyter",
"sty",
"test",
"types",
"viz",
]}

[tool.pixi.pypi-dependencies]
qrules = {path = ".", editable = true}

[tool.pyright]
exclude = [
"**/.git",
Expand Down

0 comments on commit f114f29

Please sign in to comment.