Merge pull request NifTK#450 from NifTK/fixes-445

update requirements; closes NifTK#436; NifTK#445
sinahidd3n · Oct 6, 2019 · 4bc6126 · 4bc6126
2 parents b5f3ba1 + 5c9a3a7
commit 4bc6126
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -44,8 +44,8 @@ HIG -- High-dimensional Imaging Group, UCL), where BMEIS acts as the consortium
 ### Installation
 
 1. Please install the appropriate [TensorFlow][tf] package*:
-   * [`pip install tensorflow-gpu>=1.13.2`][tf-pypi-gpu] for TensorFlow with GPU support
-   * [`pip install tensorflow>=1.13.2`][tf-pypi] for CPU-only TensorFlow
+   * [`pip install "tensorflow-gpu>=1.13.2,<2.0"`][tf-pypi-gpu] for TensorFlow with GPU support
+   * [`pip install "tensorflow>=1.13.2,<2.0"`][tf-pypi] for CPU-only TensorFlow
 1. [`pip install niftynet`](https://pypi.org/project/NiftyNet/)
 
  <sup>All other NiftyNet dependencies are installed automatically as part of the pip installation process.

diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -9,7 +9,7 @@ nibabel>=2.1.0
 numpy>=1.13.3, <= 1.14.5
 scipy>=0.18
 configparser
-tensorflow>=1.13.2
+tensorflow>=1.13.2, <2.0
 pandas
 pillow
 blinker
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
@@ -3,8 +3,8 @@ Installation
 
 1. Installing the appropriate `TensorFlow`_ package:
 
-    - ``pip install tensorflow-gpu>=1.13.2`` for TensorFlow with GPU support
-    - ``pip install tensorflow>=1.13.2`` for CPU-only TensorFlow
+    - ``pip install "tensorflow-gpu>=1.13.2,<2.0"`` for TensorFlow with GPU support
+    - ``pip install "tensorflow>=1.13.2,<2.0"`` for CPU-only TensorFlow
 
 2. Installing NiftyNet package
 

diff --git a/requirements-cpu.txt b/requirements-cpu.txt
@@ -1,9 +1,9 @@
 six>=1.10
 nibabel>=2.1.0
-numpy>=1.13.3, <= 1.14.5
+numpy>=1.13.3, <=1.14.5
 scipy>=0.18
 configparser
-tensorflow>=1.13.2
+tensorflow>=1.13.2, <2.0
 pandas
 pillow
 blinker

diff --git a/requirements-gpu.txt b/requirements-gpu.txt
@@ -1,9 +1,9 @@
 six>=1.10
 nibabel>=2.1.0
-numpy>=1.13.3, <= 1.14.5
+numpy>=1.13.3, <=1.14.5
 scipy>=0.18
 configparser
-tensorflow-gpu>=1.13.2
+tensorflow-gpu>=1.13.2, <2.0
 pandas
 pillow
 blinker