Feb 18, 2017 · Feb 18, 2017
diff --git a/.travis.yml b/.travis.yml
  - SIX_VERSION=1.9 USE_OPTIONAL=true

 install:
  -bashrequirements-install.sh
  -./requirements-install.sh

 script:
  - if [[ $TRAVIS_PYTHON_VERSION == pypy* ]]; then py.test; fi
diff --git a/requirements-install.sh b/requirements-install.sh
 #!/bin/bash -e
 #!/bin/bash -ex

 if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
  echo "fatal: \$USE_OPTIONAL not set to true or false. Exiting."
  exit 1
 fi
 pip install pip==6.1.0

 pip install -U -r requirements-test.txt

 if [[ $USE_OPTIONAL == "true" ]]; then
  pip install -U -r requirements-optional.txt
 fi

 if [[ $SIX_VERSION!= "false"]]; then
 if [[ $SIX_VERSION ]]; then
  pip install six==$SIX_VERSION
 fi
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,7 +19,7 @@ env:
		- SIX_VERSION=1.9 USE_OPTIONAL=true

		install:
		-bashrequirements-install.sh
		-./requirements-install.sh

		script:
		- if [[ $TRAVIS_PYTHON_VERSION == pypy* ]]; then py.test; fi
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,17 +1,14 @@
		#!/bin/bash -e
		#!/bin/bash -ex

		if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
		echo "fatal: \$USE_OPTIONAL not set to true or false. Exiting."
		exit 1
		fi
		pip install pip==6.1.0

		pip install -U -r requirements-test.txt

		if [[ $USE_OPTIONAL == "true" ]]; then
		pip install -U -r requirements-optional.txt
		fi

		if [[ $SIX_VERSION!= "false"]]; then
		if [[ $SIX_VERSION ]]; then
		pip install six==$SIX_VERSION
		fi

Expand Down