Merge pull request #43 from sharonwoo/master

Update CoNLL2002.ipynb and test file to reflect new sklearn API

Author: kmike

docs/CoNLL2002.ipynb

@@ -23,8 +23,8 @@
     "import sklearn\n",
     "import scipy.stats\n",
     "from sklearn.metrics import make_scorer\n",
-    "from sklearn.cross_validation import cross_val_score\n",
-    "from sklearn.grid_search import RandomizedSearchCV\n",
+    "from sklearn.model_selection import cross_val_score\n",
+    "from sklearn.model_selection import RandomizedSearchCV\n",
     "\n",
     "import sklearn_crfsuite\n",
     "from sklearn_crfsuite import scorers\n",
@@ -799,4 +799,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 0
-}
+}

tests/test_crf.py

@@ -3,7 +3,7 @@
 import pickle
 
 import pytest
-from sklearn.cross_validation import cross_val_score
+from sklearn.model_selection import cross_val_score
 
 from sklearn_crfsuite import CRF