Merge a699408 into 6966025

RasaHQ · Jan 30, 2019 · 7ba95c5 · 7ba95c5
2 parents 6966025 + a699408
commit 7ba95c5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -39,6 +39,8 @@ Changed
 - updated TensorFlow version to 1.12.0
 - updated scikit-learn version to 0.20.2
 - updated cloudpickle version to 0.6.1
+- updated requirements to match Core and SDK
+- pinned keras dependecies
 
 Removed
 -------

diff --git a/alt_requirements/requirements_bare.txt b/alt_requirements/requirements_bare.txt
@@ -2,7 +2,7 @@ gevent==1.2.2
 klein==17.10.0
 hyperlink==17.3.1
 typing==3.6.2
-future==0.16.0
+future==0.17.1
 six==1.11.0
 jsonschema==2.6.0
 matplotlib==2.1.0
@@ -11,7 +11,7 @@ tqdm==4.19.5
 numpy==1.14.5
 simplejson==3.13.2
 cloudpickle==0.6.1
-packaging==17.1
+packaging==18.0
 ruamel.yaml==0.15.78
-coloredlogs==9.0
+coloredlogs==10.0
 scikit-learn==0.20.2
diff --git a/alt_requirements/requirements_tensorflow_sklearn.txt b/alt_requirements/requirements_tensorflow_sklearn.txt
@@ -4,3 +4,5 @@
 tensorflow==1.12.0
 scipy==1.1.0
 sklearn-crfsuite==0.3.6
+keras-applications==1.0.6
+keras-preprocessing==1.0.5
diff --git a/setup.py b/setup.py
@@ -51,7 +51,9 @@
               ],
     'tensorflow': ["sklearn-crfsuite~=0.3.6",
                    "scipy~=1.1",
-                   "tensorflow~=1.12"
+                   "tensorflow~=1.12",
+                   "keras-applications==1.0.6",
+                   "keras-preprocessing==1.0.5"
                    ],
     'mitie': ["mitie"],
 }