Skip to content

Commit

Permalink
Upgrade pytest to get past CI failures on 2.7.14.
Browse files Browse the repository at this point in the history
  • Loading branch information
jsirois committed Aug 26, 2018
1 parent 69c6d6c commit ef2d921
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ matrix:
env: TOXENV=pypy-integration

install:
- pip install -U tox "setuptools<34"
- pip install -U tox "setuptools>=36"

script:
- ./scripts/ci.sh
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ commands =
# Ensure pex's main entrypoint can be run externally.
pex --cache-dir {envtmpdir}/buildcache wheel requests . -e pex.bin.pex:main --version
deps =
pytest==3.6.0
pytest==3.7.2
twitter.common.contextutil>=0.3.1,<0.4.0
twitter.common.dirutil>=0.3.1,<0.4.0
twitter.common.lang>=0.3.1,<0.4.0
Expand Down

0 comments on commit ef2d921

Please sign in to comment.