Skip to content

Commit e8dcd99

Browse files
committed
Merge necaris's changes
2 parents 0633a9b + 6986b5d commit e8dcd99

File tree

5 files changed

+106
-110
lines changed

5 files changed

+106
-110
lines changed

.github/workflows/tests.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ jobs:
66
name: lint
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
10-
- uses: actions/setup-python@v3
11-
with:
12-
python-version: "3.11"
13-
- name: pre-commit
14-
run: |
15-
python -m pip install pre-commit
16-
pre-commit run --show-diff-on-failure --all-files
9+
- uses: actions/checkout@v3
10+
- uses: actions/setup-python@v3
11+
with:
12+
python-version: "3.11"
13+
- name: pre-commit
14+
run: |
15+
python -m pip install pre-commit
16+
pre-commit run --show-diff-on-failure --all-files
1717
pytest:
1818
name: pytest
1919
runs-on: ubuntu-latest
@@ -24,11 +24,11 @@ jobs:
2424
os: [ubuntu-latest, macos-latest, windows-latest]
2525
steps:
2626
- uses: actions/checkout@v3
27-
- uses: actions/setup-python@v3
27+
- uses: actions/setup-python@v4
2828
with:
2929
python-version: ${{ matrix.python-version }}
3030
- name: Ensure poetry
3131
uses: abatilo/actions-poetry@v2
3232
- uses: wntrblm/[email protected]
3333
- name: Run matrix of tests
34-
run: nox
34+
run: nox --no-venv --non-interactive --python ${{ matrix.python-version }}

.pre-commit-config.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
default_language_version:
2-
python: python3.10
31
fail_fast: true
42
repos:
53
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v2.1.0
4+
rev: v3.0.0
75
hooks:
86
- id: check-merge-conflict
97
- id: check-yaml

0 commit comments

Comments
 (0)