Merge pull request RasaHQ#1640 from RasaHQ/fix_sklearn_req

Fix sklearn req

Author: akelad

CHANGELOG.rst

@@ -6,6 +6,13 @@ This project adheres to `Semantic Versioning`_ starting with version 0.7.0.
 
 .. _v0-14-0:
 
+[0.14.1] - 2018-01-23
+^^^^^^^^^^^^^^^^^^^^^
+
+Fixed
+-----
+- scikit-learn is a global requirement
+
 [0.14.0] - 2018-01-23
 ^^^^^^^^^^^^^^^^^^^^^
 

alt_requirements/requirements_bare.txt

@@ -14,3 +14,4 @@ cloudpickle==0.6.1
 packaging==17.1
 ruamel.yaml==0.15.78
 coloredlogs==9.0
+scikit-learn==0.20.2

alt_requirements/requirements_spacy_sklearn.txt

@@ -2,6 +2,5 @@
 -r requirements_bare.txt
 
 spacy==2.0.18
-scikit-learn==0.20.2
 scipy==1.1.0
 sklearn-crfsuite==0.3.6

alt_requirements/requirements_tensorflow_sklearn.txt

@@ -1,7 +1,6 @@
 # Minimum Install Requirements
 -r requirements_bare.txt
 
-scikit-learn==0.20.2
 tensorflow==1.12.0
 scipy==1.1.0
 sklearn-crfsuite==0.3.6

rasa_nlu/version.py

@@ -3,4 +3,4 @@
 from __future__ import division
 from __future__ import absolute_import
 
-__version__ = '0.14.0'
+__version__ = '0.14.1'

setup.py

@@ -40,17 +40,16 @@
     "simplejson~=3.13",
     "ruamel.yaml~=0.15.7",
     "coloredlogs~=9.0",
+    "scikit-learn~=0.20.2"
 ]
 
 extras_requires = {
     'test': tests_requires,
-    'spacy': ["scikit-learn~=0.20.2",
-              "sklearn-crfsuite~=0.3.6",
+    'spacy': ["sklearn-crfsuite~=0.3.6",
               "scipy~=1.1",
               "spacy<=2.0.18,>2.0",
               ],
-    'tensorflow': ["scikit-learn~=0.20.2",
-                   "sklearn-crfsuite~=0.3.6",
+    'tensorflow': ["sklearn-crfsuite~=0.3.6",
                    "scipy~=1.1",
                    "tensorflow~=1.12"
                    ],