Skip to content

Commit ade8567

Browse files
committed
Tune older-pytest CI config
1 parent a390056 commit ade8567

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@ jobs:
4242
- audit-conjecture-rust
4343
- lint-conjecture-rust
4444
- check-nose
45-
- check-pytest4
46-
- check-pytest5
47-
- check-pytest6
48-
- check-pytest7
45+
- check-pytest46
46+
- check-pytest54
47+
- check-pytest62
4948
- check-django40
5049
- check-django32
5150
- check-django22

hypothesis-python/tox.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,25 +103,25 @@ deps =
103103
commands=
104104
nosetests tests/cover/test_testdecorators.py
105105

106-
[testenv:pytest4]
106+
[testenv:pytest46]
107107
deps =
108108
-r../requirements/test.txt
109109
commands=
110-
pip install pytest==4.* pytest-xdist==1.34
110+
pip install pytest==4.6.11 pytest-xdist==1.34
111111
python -bb -X dev -m pytest tests/pytest tests/cover/test_testdecorators.py
112112

113-
[testenv:pytest5]
113+
[testenv:pytest54]
114114
deps =
115115
-r../requirements/test.txt
116116
commands=
117-
pip install pytest==5.* pytest-xdist
117+
pip install pytest==5.4.3 pytest-xdist
118118
python -bb -X dev -m pytest tests/pytest tests/cover/test_testdecorators.py
119119

120-
[testenv:pytest6]
120+
[testenv:pytest62]
121121
deps =
122122
-r../requirements/test.txt
123123
commands=
124-
pip install pytest==6.* pytest-xdist
124+
pip install pytest==6.2.5 pytest-xdist
125125
python -bb -X dev -m pytest tests/pytest tests/cover/test_testdecorators.py
126126

127127
[testenv:pytest7]

tooling/src/hypothesistooling/__main__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ def check_pypy38():
451451

452452
@task()
453453
def tox(*args):
454-
if len(args) == 0:
454+
if len(args) < 2:
455455
print("Usage: ./build.sh tox TOX_ENV PY_VERSION [tox args]")
456456
sys.exit(1)
457457
run_tox(args[0], args[1], *args[2:])
@@ -462,10 +462,9 @@ def standard_tox_task(name):
462462

463463

464464
standard_tox_task("nose")
465-
standard_tox_task("pytest4")
466-
standard_tox_task("pytest5")
467-
standard_tox_task("pytest6")
468-
standard_tox_task("pytest7")
465+
standard_tox_task("pytest46")
466+
standard_tox_task("pytest54")
467+
standard_tox_task("pytest62")
469468

470469
for n in [22, 32, 40]:
471470
standard_tox_task(f"django{n}")

0 commit comments

Comments
 (0)