Skip to content

Commit f3f1260

Browse files
authored
Merge branch 'master' into pypy
2 parents bc355f2 + bdf52a7 commit f3f1260

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
@@ -93,8 +93,8 @@ jobs:
9393
strategy:
9494
matrix:
9595
python:
96-
- short: 37
97-
dotted: 3.7
96+
- short: 38
97+
dotted: 3.8
9898
steps:
9999
- uses: actions/checkout@v2
100100
- name: Set up Python ${{ matrix.python.dotted }}
@@ -108,3 +108,14 @@ jobs:
108108
- name: Test
109109
run: |
110110
tox -v -e linting
111+
all:
112+
name: All
113+
runs-on: ubuntu-latest
114+
needs:
115+
- test
116+
- linting
117+
steps:
118+
- name: This
119+
shell: python
120+
run: |
121+
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)