Merge 336862c into 3fd482c

ClearcodeHQ · Dec 5, 2016 · 34d795d · 34d795d
2 parents 3fd482c + 336862c
commit 34d795d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ env:
 - XDIST=1 INSTALL=install
 - XDIST=0 INSTALL=develop
 install:
-- pip install "setuptools>=18.0.0"
+- pip install "setuptools>=18.0.0,<30.0.0" # pypy support
 - "pip install -r requirements-test.txt"
 - python setup.py $INSTALL
 - pip install pytest_elasticsearch[tests] coveralls wheel

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -6,6 +6,6 @@ pydocstyle==1.1.1
 pycodestyle==2.2.0
 mccabe==0.5.2
 pyroma==2.2
-pytest==3.0.4 #  rq.filter: !=2.9.0,!=2.9.1,!=2.9.2
+pytest==3.0.5 #  rq.filter: !=2.9.0,!=2.9.1,!=2.9.2
 path.py==9.0
 port-for==0.3.1