Skip to content

Commit 8e001ca

Browse files
authored
ci: updates (#90)
* ci: update the action and tox Signed-off-by: Henry Schreiner <[email protected]> * ci: update pre-commits Signed-off-by: Henry Schreiner <[email protected]> --------- Signed-off-by: Henry Schreiner <[email protected]>
1 parent 8646218 commit 8e001ca

File tree

4 files changed

+15
-29
lines changed

4 files changed

+15
-29
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
- main
88
pull_request:
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
env:
1115
FORCE_COLOR: "1"
1216

@@ -34,24 +38,20 @@ jobs:
3438
python-version: ${{ matrix.python-version }}
3539

3640
- name: Install test dependencies
37-
run: |
38-
python -m pip install --upgrade pip
39-
pip install tox tox-gh-actions
41+
run: pip install tox tox-gh-actions
4042

4143
- name: Test packaging
4244
run: tox -e pkg
4345

4446
- name: Run tests with PyTest 6
4547
run: tox
4648
env:
47-
PLATFORM: ${{ matrix.os }}
4849
PYTEST_MAJOR_VERSION: 6
4950
PYTEST_PLUGINS: pytest_github_actions_annotate_failures
5051

5152
- name: Run tests with PyTest 7
5253
run: tox
5354
env:
54-
PLATFORM: ${{ matrix.os }}
5555
PYTEST_MAJOR_VERSION: 7
5656
PYTEST_PLUGINS: pytest_github_actions_annotate_failures
5757

.pre-commit-config.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: "v4.4.0"
3+
rev: "v5.0.0"
44
hooks:
55
- id: check-added-large-files
66
- id: check-case-conflict
@@ -13,13 +13,8 @@ repos:
1313
- id: requirements-txt-fixer
1414
- id: trailing-whitespace
1515

16-
- repo: https://github.com/mgedmin/check-manifest
17-
rev: "0.49"
18-
hooks:
19-
- id: check-manifest
20-
2116
- repo: https://github.com/astral-sh/ruff-pre-commit
22-
rev: "v0.0.262"
17+
rev: "v0.7.0"
2318
hooks:
2419
- id: ruff
2520
args: ["--fix", "--show-fixes"]

pyproject.toml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ changelog = "https://github.com/pytest-dev/pytest-github-actions-annotate-failur
5252
pytest_github_actions_annotate_failures = "pytest_github_actions_annotate_failures.plugin"
5353

5454

55-
[tool.ruff]
56-
select = [
57-
"E", "F", "W", # flake8
55+
[tool.ruff.lint]
56+
extend-select = [
5857
"B", # flake8-bugbear
5958
"I", # isort
6059
"ARG", # flake8-unused-arguments
@@ -74,17 +73,11 @@ select = [
7473
"YTT", # flake8-2020
7574
"EXE", # flake8-executable
7675
]
77-
extend-ignore = [
76+
ignore = [
7877
"PLR", # Design related pylint codes
79-
"E501", # Line too long
8078
"PT004", # Use underscore for non-returning fixture (use usefixture instead)
8179
]
82-
target-version = "py37"
83-
unfixable = [
84-
"T20", # Removes print statements
85-
"F841", # Removes unused variables
86-
]
8780
isort.required-imports = ["from __future__ import annotations"]
8881

89-
[tool.ruff.per-file-ignores]
82+
[tool.ruff.lint.per-file-ignores]
9083
"tests/**" = ["T20"]

tox.ini

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{37,38,39,310,311,312}-pytest{6,7}-{linux,windows}
3+
py{37,38,39,310,311,312}-pytest{6,7,8}
44
pkg
55

66
[gh-actions]
@@ -13,21 +13,19 @@ python =
1313
3.12: py312
1414

1515
[gh-actions:env]
16-
PLATFORM =
17-
ubuntu-latest: linux
18-
windows-latest: windows
19-
2016
PYTEST_MAJOR_VERSION =
2117
6: pytest6
2218
7: pytest7
19+
8: pytest8
2320

2421
[testenv]
2522
deps =
2623
-rrequirements.txt
2724
pytest6: pytest>=6.0.0,<7.0.0
2825
pytest7: pytest>=7.0.0,<7.4.0
26+
pytest8: pytest>=8.0.0,<9.0.0
2927

30-
commands = {envpython} -m pytest
28+
commands = {envpython} -m pytest {posargs}
3129

3230
[testenv:pkg]
3331
skip_install = true

0 commit comments

Comments
 (0)