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
8 changes: 2 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ env:
FORCE_COLOR: 1

jobs:
tox-jobs:
strategy:
fail-fast: false
matrix:
tox-job: [doc, pep8]
doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
Expand All @@ -22,7 +18,7 @@ jobs:
with:
python-version: 3.x
- run: pip install tox
- run: tox -e ${{ matrix.tox-job }}
- run: tox -e doc
build:
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} - ${{ matrix.python }} ${{ matrix.build }}
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ permissions: {}

env:
FORCE_COLOR: 1
RUFF_OUTPUT_FORMAT: github

jobs:
lint:
Expand All @@ -15,8 +16,4 @@ jobs:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: "3.x"
- uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
- uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4
10 changes: 8 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.22
hooks:
- id: ruff-check
args: [--exit-non-zero-on-fix]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v6.0.0
hooks:
Expand All @@ -14,7 +20,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.37.1
rev: 0.37.4
hooks:
- id: check-dependabot
- id: check-github-workflows
Expand All @@ -25,7 +31,7 @@ repos:
- id: actionlint

- repo: https://github.com/zizmorcore/zizmor-pre-commit
rev: v1.24.1
rev: v1.29.0
hooks:
- id: zizmor

Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ packages = ["pyperf", "pyperf.tests"]
[tool.setuptools.dynamic]
version = {attr = "pyperf.__version__"}

[tool.ruff]
fix = true

[tool.ruff.lint]
extend-select = ["C90", "UP"]
extend-ignore = ["UP015", "UP031"]
Expand Down
8 changes: 1 addition & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py3, pypy3, doc, pep8
envlist = py3, pypy3, doc
isolated_build = True

[testenv]
Expand All @@ -16,9 +16,3 @@ deps = sphinx
allowlist_externals = make
commands=
make -C doc html

[testenv:pep8]
basepython = python3
deps = ruff
commands =
ruff check