Merge branch 'evaluation-successes' of https://github.com/blakeandrewwood/rasa_nlu into pr/1559

Author: MetcalfeTom

CHANGELOG.rst

@@ -28,6 +28,7 @@ Changed
 - replaced ``yaml`` with ``ruamel.yaml``
 - updated spacy version to 2.0.18
 - updated TensorFlow version to 1.12.0
+- updated scikit-learn version to 0.20.2
 
 Removed
 -------
@@ -46,6 +47,7 @@ Fixed
 - Updated CORS support for the server.
   Added the ``Access-Control-Allow-Headers`` and ``Content-Type`` headers for nlu server
 - parsing of emojis which are sent within jsons
+- Bad input shape error from ``sklearn_intent_classifier`` when using ``scikit-learn==0.20.2``
 
 [0.13.8] - 2018-11-21
 ^^^^^^^^^^^^^^^^^^^^^

setup.py

@@ -44,12 +44,12 @@
 
 extras_requires = {
     'test': tests_requires,
-    'spacy': ["scikit-learn<0.20",
+    'spacy': ["scikit-learn~=0.20.2",
               "sklearn-crfsuite~=0.3.6",
               "scipy~=1.1",
               "spacy<=2.0.18,>2.0",
               ],
-    'tensorflow': ["scikit-learn<0.20",
+    'tensorflow': ["scikit-learn~=0.20.2",
                    "sklearn-crfsuite~=0.3.6",
                    "scipy~=1.1",
                    "tensorflow~=1.12"