Merge d299340 into e09d32b

ClimateImpactLab · Jul 12, 2017 · 7925f87 · 7925f87
2 parents e09d32b + d299340
commit 7925f87
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 
 python:
   - 2.7
-  - pypy
+  - pypy-5.4.1
 
 env:
   matrix:
@@ -11,10 +11,11 @@ env:
 
 matrix:
   allow_failures:
-    - python: pypy
+    - python: pypy-5.4.1
       env: IMPACTLAB_USER_TEST_ENV=conda
 
 install:
+  - export BOTO_CONFIG=/dev/null
   - if [[ "$IMPACTLAB_USER_TEST_ENV" == "conda" ]]; then
       if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
           wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
@@ -38,6 +39,7 @@ install:
   - python -m pip install pytest-cov
 
 script:
+  - export BOTO_CONFIG=/dev/null
   - export PATH=/home/travis/miniconda/bin:$PATH
   - export PATH=/home/travis/miniconda1/bin:$PATH
   - export PATH=/home/travis/miniconda2/bin:$PATH