Merge pull request #352 from jdufresne/fix-test-failures

Fix Travis CI builds on Python 3.4

Author: willkg

requirements-install.sh

@@ -1,15 +1,15 @@
 #!/bin/bash -ex
 
-pip install -U -r requirements-test.txt
-
-if [[ $USE_OPTIONAL == "true" ]]; then
-  pip install -U -r requirements-optional.txt
-fi
-
 if [[ $SIX_VERSION ]]; then
   pip install six==$SIX_VERSION
 fi
 
+pip install -r requirements-test.txt
+
+if [[ $USE_OPTIONAL == "true" ]]; then
+  pip install -r requirements-optional.txt
+fi
+
 if [[ $CI == "true" ]]; then
-  pip install -U codecov
+  pip install codecov
 fi