Merge 25f1311 into dd1e31e

vanvalenlab · Sep 28, 2020 · 38496b6 · 38496b6
2 parents dd1e31e + 25f1311
commit 38496b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,13 +7,12 @@ git:
 language: python
 
 python:
-  - 2.7
+  - 3.5
   - 3.6
   - 3.7
 
 env:
-  - TF_VERSION=1.14.0
-  - TF_VERSION=1.15.0
+  - TF_VERSION=1.15.4
 
 install:
   # code below is taken from https://github.com/keras-team/keras/blob/master/.travis.yml
@@ -73,8 +72,8 @@ jobs:
   include:
     - stage: deploy
       if: tag IS present
-      env: TF_VERSION=1.14.0
-      python: 3.6
+      env: TF_VERSION=1.15.4
+      python: 3.7
       script:
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # build an image with the CPU TensorFlow base image

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # Use tensorflow/tensorflow as the base image
 # Change the build arg to edit the tensorflow version.
 # Only supporting python3.
-ARG TF_VERSION=1.14.0-gpu
+ARG TF_VERSION=1.15.4-gpu
 
 FROM tensorflow/tensorflow:${TF_VERSION}-py3
 

diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ numpy>=1.16.4,<2
 scipy>=1.1.0,<2
 scikit-image>=0.14.1,<=0.16.2
 scikit-learn>=0.19.1,<1
-tensorflow>=1.14.0,<2
+tensorflow>=1.15.4,<2
 jupyter>=1.0.0,<2
 nbformat>=4.4.0,<5
 keras-applications==1.0.8