Skip to content

Commit 9963acc

Browse files
authored
Merge branch 'master' into update-copyright
2 parents 4d1c696 + f1e8ede commit 9963acc

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ jobs:
7575
strategy:
7676
matrix:
7777
python:
78-
- short: 37
79-
dotted: 3.7
78+
- short: 38
79+
dotted: 3.8
8080
steps:
8181
- uses: actions/checkout@v2
8282
- name: Set up Python ${{ matrix.python.dotted }}
@@ -90,3 +90,14 @@ jobs:
9090
- name: Test
9191
run: |
9292
tox -v -e linting
93+
all:
94+
name: All
95+
runs-on: ubuntu-latest
96+
needs:
97+
- test
98+
- linting
99+
steps:
100+
- name: This
101+
shell: python
102+
run: |
103+
import this

pytest.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[pytest]
2+
addopts = --verbose
23
filterwarnings = error

tox.ini

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ deps=
1515
qt5reactor: qt5reactor
1616
qt5reactor: pytest-xvfb
1717
qt5reactor: pyqt5
18+
setenv=
19+
defaultreactor: REACTOR = default
20+
qt5reactor: REACTOR = qt5reactor
21+
asyncioreactor: REACTOR = asyncio
1822
commands=
19-
defaultreactor: pytest --reactor=default
20-
qt5reactor: pytest --reactor=qt5reactor
21-
asyncioreactor: pytest --reactor=asyncio
23+
pytest --reactor={env:REACTOR}
2224
sitepackages=False
2325
download=true
2426

@@ -28,6 +30,3 @@ commands=flake8 *.py testing
2830

2931
[flake8]
3032
ignore=N802
31-
32-
[pytest]
33-
addopts=-v

0 commit comments

Comments
 (0)