Skip to content

Commit 4589e2a

Browse files
authored
Merge branch 'master' into lint_with_py38
2 parents cb6b9e2 + 8ae5215 commit 4589e2a

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@ commands=flake8 *.py testing
2828

2929
[flake8]
3030
ignore=N802
31-
32-
[pytest]
33-
addopts=-v

0 commit comments

Comments
 (0)