Skip to content

Commit 299fcea

Browse files
authored
Merge branch 'master' into one_command
2 parents 3a58de7 + bdf52a7 commit 299fcea

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
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: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,3 @@ commands=flake8 *.py testing
3030

3131
[flake8]
3232
ignore=N802
33-
34-
[pytest]
35-
addopts=-v

0 commit comments

Comments
 (0)