From fe6857eabdb9c51962dd958464a1b3b8fd163686 Mon Sep 17 00:00:00 2001
From: Scott Leishman <scott.leishman@gmail.com>
Date: Thu, 15 Nov 2018 05:29:49 -0800
Subject: [PATCH] broaden supported package versions (#50)

* broaden supported package versions.
* fix mxnet variants.
Also back-out tuple deprecation change introduced in prior commit.
* correct CI image deployment on master branch merge.
---
 .circleci/config.yml |  4 ++--
 requirements.txt     | 36 ++++++++++++++++++------------------
 setup.py             | 10 +++++-----
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d966349..1b9e0c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -315,11 +315,11 @@ jobs:
             TAG=$(git describe --tags --always --dirty)
 
             docker pull ${REGISTRY}/coach-base:${TAG}
-            docker tag ${REGISTRY}/coach-base:${TAG} coach-base:${MASTER_BRANCH}
+            docker tag ${REGISTRY}/coach-base:${TAG} ${REGISTRY}/coach-base:${MASTER_BRANCH}
             docker push ${REGISTRY}/coach-base:${MASTER_BRANCH}
 
             docker pull ${REGISTRY}/coach:${TAG}
-            docker tag ${REGISTRY}/coach:${TAG} coach:${MASTER_BRANCH}
+            docker tag ${REGISTRY}/coach:${TAG} ${REGISTRY}/coach:${MASTER_BRANCH}
             docker push ${REGISTRY}/coach:${MASTER_BRANCH}
 
 workflows:
diff --git a/requirements.txt b/requirements.txt
index 2e1d515..c818202 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,18 +1,18 @@
-annoy==1.8.3
-Pillow==4.3.0
-matplotlib==2.0.2
-numpy==1.14.5
-pandas==0.22.0
-pygame==1.9.3
-PyOpenGL==3.1.0
-scipy==0.19.0
-scikit-image==0.13.0
-box2d==2.3.2
-gym[atari]==0.10.5
-bokeh==0.13.0
-futures==3.1.1
-wxPython==4.0.1
-kubernetes==8.0.0b1
-redis==2.10.6
-minio==4.0.5
-pytest==3.8.2
+annoy>=1.8.3
+Pillow>=4.3.0
+matplotlib>=2.0.2
+numpy>=1.14.5
+pandas>=0.22.0
+pygame>=1.9.3
+PyOpenGL>=3.1.0
+scipy>=0.19.0
+scikit-image>=0.13.0
+box2d>=2.3.2
+gym[atari]>=0.10.5
+bokeh>=0.13.0
+futures>=3.1.1
+wxPython>=4.0.1
+kubernetes>=8.0.0b1
+redis>=2.10.6
+minio>=4.0.5
+pytest>=3.8.2
diff --git a/setup.py b/setup.py
index 9e6152a..9859bd5 100644
--- a/setup.py
+++ b/setup.py
@@ -63,13 +63,13 @@ if not using_GPU:
     # For linux wth no GPU, we install the Intel optimized version of TensorFlow
     if sys.platform == "linux" or sys.platform == "linux2":
         subprocess.check_call(['pip install '
-                               'https://anaconda.org/intel/tensorflow/1.6.0/download/tensorflow-1.6.0-cp35-cp35m-linux_x86_64.whl'],
+                               'https://storage.googleapis.com/intel-optimized-tensorflow/tensorflow-1.11.0-cp35-cp35m-linux_x86_64.whl'],
                               shell=True)
-    install_requires.append('tensorflow==1.6.0')
-    extras['mxnet'] = ['mxnet-cu90mkl>=1.3.0']
-else:
-    install_requires.append('tensorflow-gpu==1.9.0')
+    install_requires.append('tensorflow>=1.9.0')
     extras['mxnet'] = ['mxnet-mkl>=1.3.0']
+else:
+    install_requires.append('tensorflow-gpu>=1.9.0')
+    extras['mxnet'] = ['mxnet-cu90mkl>=1.3.0']
 
 all_deps = []
 for group_name in extras: