Skip to content

Commit

Permalink
Merge pull request pytest-dev#1962 from nicoddemus/fix-ci
Browse files Browse the repository at this point in the history
Pin hypothesis to 3.5.0 because 3.5.1 breaks the test suite
  • Loading branch information
nicoddemus authored Sep 26, 2016
2 parents 09bcf7f + 73cab77 commit 01068e5
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ envlist=
commands= pytest --lsof -rfsxX {posargs:testing}
passenv = USER USERNAME
deps=
hypothesis
# pin to 3.5.0 until 3.5.2 is released
hypothesis==3.5.0
nose
mock
requests
Expand Down Expand Up @@ -47,7 +48,8 @@ commands = flake8 pytest.py _pytest testing
deps=pytest-xdist>=1.13
mock
nose
hypothesis
# pin to 3.5.0 until 3.5.2 is released
hypothesis==3.5.0
commands=
pytest -n1 -rfsxX {posargs:testing}

Expand All @@ -71,8 +73,10 @@ commands=
pytest -rfsxX test_pdb.py test_terminal.py test_unittest.py

[testenv:py27-nobyte]
deps=pytest-xdist>=1.13
hypothesis
deps=
pytest-xdist>=1.13
# pin to 3.5.0 until 3.5.2 is released
hypothesis==3.5.0
distribute=true
setenv=
PYTHONDONTWRITEBYTECODE=1
Expand Down

0 comments on commit 01068e5

Please sign in to comment.