Try upgrading pytest - pull along packaging and setuptools for the ride.

pex-tool · Aug 25, 2018 · 6a9c8eb · 6a9c8eb
1 parent 69c6d6c
commit 6a9c8eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/tox.ini b/tox.ini
@@ -11,14 +11,14 @@ 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
     twitter.common.testing>=0.3.1,<0.4.0
     wheel==0.31.1
-    packaging==16.8
-    setuptools<34.0
+    packaging==17.1
+    setuptools>=36.0
     list-tests: mock==2.0.0
     py27: mock==2.0.0
     pypy: mock==2.0.0