Skip to content

Commit 5c34b84

Browse files
committed
Merge branch 'master' into feature/drop-python-2
2 parents 85a983b + 4f74355 commit 5c34b84

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
- "dpath/"
99
- "**.py"
1010
- "tox.ini"
11-
pull_request:
1211

1312
# Allows you to run this workflow manually from the Actions tab
1413
workflow_dispatch:

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ envlist = py36, pypy37, py38, py39, flake8
1212
[gh-actions]
1313
python =
1414
3.6: py36
15-
# TODO(moomoohk): Get pypy to work properly. https://github.com/ymyzk/run-tox-gh-actions/issues/3
16-
pypi-3.7: pypy37
15+
pypy-3.7: pypy37
1716
3.8: py38
1817
3.9: py39, flake8
1918

0 commit comments

Comments
 (0)