Merge branch 'fix-smqtk-caffe' of github.com:chrismattmann/SMQTK into…

… fix-smqtk-caffe
Kitware · Oct 31, 2018 · 67dfee2 · 67dfee2
2 parents 2b778b3 + 532bcc6
commit 67dfee2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/devops/docker/smqtk_wrapper_python/requirements.txt b/devops/docker/smqtk_wrapper_python/requirements.txt
@@ -1,2 +1,2 @@
-Flask==0.12.2
-requests==2.11.1
+Flask==0.12.3
+requests==2.20.0
diff --git a/docs/release_notes/pending_release.rst b/docs/release_notes/pending_release.rst
@@ -57,7 +57,8 @@ Docker
 
 Misc.
 
-    - Update requests package version in ``requirements.txt`` file due to
+    - Update requests and flask package version in ``requirements.txt`` and
+      ``devops/docker/smqtk_wrapper_python/requirements.txt`` files due to
       GitHub security alert.
 
 Utilities

diff --git a/requirements.txt b/requirements.txt
@@ -2,23 +2,23 @@
 --index-url https://pypi.python.org/simple/
 
 # Core deps
-Flask==0.12.2
+Flask==0.12.3
 Flask-BasicAuth==0.2.0
-Flask-login==0.4.0
-Flask-Cors==3.0.0
-imageio==2.2.0
-jinja2==2.9.6
-matplotlib==2.0.2
-numpy==1.13.0
-Pillow==4.0.0
-pymongo==3.4.0
+Flask-login==0.4.1
+Flask-Cors==3.0.6
+imageio==2.3.0
+jinja2==2.10
+matplotlib==2.2.3
+numpy==1.15.3
+Pillow==5.3.0
+pymongo==3.7.2
 requests==2.20.0
-scikit-learn==0.18.1
-scipy==0.19.0
-six==1.10.0
+scikit-learn==0.20.0
+scipy==1.1.0
+six==1.11.0
 
 # Testing deps
-coverage==4.4.1
+coverage==4.5.1
 mock==2.0.0
-pytest==3.2.3
-pytest-cov==2.5.1
+pytest==3.9.3
+pytest-cov==2.6.0
diff --git a/setup.py b/setup.py
@@ -133,9 +133,7 @@ def list_directory_files(dirpath, exclude_dirs=(), exclude_files=()):
         'jinja2',
         'matplotlib',
         'numpy',
-        # Pinning Pillow version due to large-image conversion issue in versions
-        # 4.1.0 and up.
-        'pillow==4.0.0',
+        'pillow',
         'pymongo',
         'requests',
         'scikit-learn',