Merge pull request influxdata#529 from xginn8/master

aviau · web-flow · commit c086c1ee1287 · 2017-10-28T16:27:39.000-04:00
fixing broken pypy test
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,7 @@ matrix:
 
 install:
     - pip install tox
+    - pip install setuptools==20.6.6
     - pip install coveralls
     - mkdir influxdb_install
     - wget https://dl.influxdata.com/influxdb/releases/influxdb_1.2.4_amd64.deb
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,4 +1,4 @@
 nose
 nose-cov
 mock
-requests-mock
+requests-mock
