From a8797b1e100821f30b362c6a054c4b23d874abef Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Tue, 11 Feb 2020 20:58:41 -0800 Subject: [PATCH 1/4] Disable bitrotten python 3.5 tests --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 582e30e..62befec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,9 @@ dist: trusty language: python python: - 2.7 - - 3.5 +# Python 3.5 is unfortunately bitrotten. See this build for an example +# https://travis-ci.org/google/unrestricted-adversarial-examples/builds/625054022 +# - 3.5 env: - TENSORFLOW_V=1.8.0 From f0cd95634088b64e881be048eb4cd72da610362f Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Tue, 11 Feb 2020 21:15:01 -0800 Subject: [PATCH 2/4] Switch to python 3.5 --- .travis.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62befec..f7dcd31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,9 @@ sudo: required dist: trusty language: python python: - - 2.7 -# Python 3.5 is unfortunately bitrotten. See this build for an example -# https://travis-ci.org/google/unrestricted-adversarial-examples/builds/625054022 -# - 3.5 - + - 3.5 env: - - TENSORFLOW_V=1.8.0 + - TENSORFLOW_V=1.15.2 install: # code below is taken from http://conda.pydata.org/docs/travis.html @@ -33,12 +29,7 @@ install: - source activate test-environment # install TensorFlow - - > - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" && "$TENSORFLOW_V" == "1.8.0" ]]; then - pip install https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.8.0-cp27-none-linux_x86_64.whl; - elif [[ "$TRAVIS_PYTHON_VERSION" == "3.5" && "$TENSORFLOW_V" == "1.8.0" ]]; then - pip install https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.8.0-cp35-cp35m-linux_x86_64.whl; - fi + - pip install tensorflow=="$TENSORFLOW_V" # command to run tests script: From 0ab2ca2551737f729b84b3267e2b9593e1e4b5eb Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Tue, 11 Feb 2020 21:19:25 -0800 Subject: [PATCH 3/4] Fix version --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7dcd31..abe0c01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ dist: trusty language: python python: - 3.5 -env: - - TENSORFLOW_V=1.15.2 install: # code below is taken from http://conda.pydata.org/docs/travis.html @@ -29,7 +27,7 @@ install: - source activate test-environment # install TensorFlow - - pip install tensorflow=="$TENSORFLOW_V" + - pip install tensorflow==1.15.2 # command to run tests script: From 0f507130b7460d2fa159ca759f27c416393f432f Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Tue, 11 Feb 2020 21:23:34 -0800 Subject: [PATCH 4/4] Switch tf version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abe0c01..d01d28f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: - source activate test-environment # install TensorFlow - - pip install tensorflow==1.15.2 + - pip install tensorflow==1.14.0 # command to run tests script: