Merge pull request #774 from rasbt/deprecation-fixes

modify for sklearn 0.24.1
rasbt · Feb 8, 2021 · c90a9bc · c90a9bc
2 parents c79b08b + 59783d6
commit c90a9bc
Show file tree

Hide file tree

Showing 19 changed files with 475 additions and 349 deletions.
diff --git a/docs/sources/CHANGELOG.md b/docs/sources/CHANGELOG.md
@@ -19,7 +19,7 @@ The CHANGELOG for the current development version is available at
 
 ##### Changes
 
-- -
+- Updates unit tests for scikit-learn 0.24.1 compatibility. ([#774](https://github.com/rasbt/mlxtend/pull/774))
 
 ##### Bug Fixes
 

diff --git a/docs/sources/user_guide/evaluate/PredefinedHoldoutSplit.ipynb b/docs/sources/user_guide/evaluate/PredefinedHoldoutSplit.ipynb
@@ -104,17 +104,9 @@
     {
      "data": {
       "text/plain": [
-       "GridSearchCV(cv=<mlxtend.evaluate.holdout.PredefinedHoldoutSplit object at 0x7f93c8d16b38>,\n",
-       "             error_score=nan,\n",
-       "             estimator=KNeighborsClassifier(algorithm='auto', leaf_size=30,\n",
-       "                                            metric='minkowski',\n",
-       "                                            metric_params=None, n_jobs=None,\n",
-       "                                            n_neighbors=5, p=2,\n",
-       "                                            weights='uniform'),\n",
-       "             iid='deprecated', n_jobs=None,\n",
-       "             param_grid={'n_neighbors': [1, 2, 3, 4, 5]},\n",
-       "             pre_dispatch='2*n_jobs', refit=True, return_train_score=False,\n",
-       "             scoring=None, verbose=0)"
+       "GridSearchCV(cv=<mlxtend.evaluate.holdout.PredefinedHoldoutSplit object at 0x7fb300565610>,\n",
+       "             estimator=KNeighborsClassifier(),\n",
+       "             param_grid={'n_neighbors': [1, 2, 3, 4, 5]})"
       ]
      },
      "execution_count": 3,
@@ -162,9 +154,9 @@
       "\n",
       "Train/Validation set splitter for sklearn's GridSearchCV etc.\n",
       "\n",
-      "Uses user-specified train/validation set indices to split a dataset\n",
-      "into train/validation sets using user-defined or random\n",
-      "indices.\n",
+      "    Uses user-specified train/validation set indices to split a dataset\n",
+      "    into train/validation sets using user-defined or random\n",
+      "    indices.\n",
       "\n",
       "**Parameters**\n",
       "\n",
@@ -178,7 +170,7 @@
       "**Examples**\n",
       "\n",
       "For usage examples, please see\n",
-      "    [http://rasbt.github.io/mlxtend/user_guide/evaluate/PredefinedHoldoutSplit/](http://rasbt.github.io/mlxtend/user_guide/evaluate/PredefinedHoldoutSplit/)\n",
+      "    http://rasbt.github.io/mlxtend/user_guide/evaluate/PredefinedHoldoutSplit/\n",
       "\n",
       "### Methods\n",
       "\n",
@@ -274,7 +266,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.8.2"
   },
   "toc": {
    "nav_menu": {},

diff --git a/docs/sources/user_guide/evaluate/RandomHoldoutSplit.ipynb b/docs/sources/user_guide/evaluate/RandomHoldoutSplit.ipynb
@@ -104,17 +104,9 @@
     {
      "data": {
       "text/plain": [
-       "GridSearchCV(cv=<mlxtend.evaluate.holdout.RandomHoldoutSplit object at 0x7fcf8061ba90>,\n",
-       "             error_score=nan,\n",
-       "             estimator=KNeighborsClassifier(algorithm='auto', leaf_size=30,\n",
-       "                                            metric='minkowski',\n",
-       "                                            metric_params=None, n_jobs=None,\n",
-       "                                            n_neighbors=5, p=2,\n",
-       "                                            weights='uniform'),\n",
-       "             iid='deprecated', n_jobs=None,\n",
-       "             param_grid={'n_neighbors': [1, 2, 3, 4, 5]},\n",
-       "             pre_dispatch='2*n_jobs', refit=True, return_train_score=False,\n",
-       "             scoring=None, verbose=0)"
+       "GridSearchCV(cv=<mlxtend.evaluate.holdout.RandomHoldoutSplit object at 0x7fae707f6610>,\n",
+       "             estimator=KNeighborsClassifier(),\n",
+       "             param_grid={'n_neighbors': [1, 2, 3, 4, 5]})"
       ]
      },
      "execution_count": 3,
@@ -161,8 +153,8 @@
       "\n",
       "Train/Validation set splitter for sklearn's GridSearchCV etc.\n",
       "\n",
-      "Provides train/validation set indices to split a dataset\n",
-      "into train/validation sets using random indices.\n",
+      "    Provides train/validation set indices to split a dataset\n",
+      "    into train/validation sets using random indices.\n",
       "\n",
       "**Parameters**\n",
       "\n",
@@ -185,7 +177,7 @@
       "**Examples**\n",
       "\n",
       "For usage examples, please see\n",
-      "    [http://rasbt.github.io/mlxtend/user_guide/evaluate/RandomHoldoutSplit/](http://rasbt.github.io/mlxtend/user_guide/evaluate/RandomHoldoutSplit/)\n",
+      "    http://rasbt.github.io/mlxtend/user_guide/evaluate/RandomHoldoutSplit/\n",
       "\n",
       "### Methods\n",
       "\n",
@@ -281,7 +273,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.8.2"
   },
   "toc": {
    "nav_menu": {},

diff --git a/docs/sources/user_guide/feature_extraction/PrincipalComponentAnalysis.ipynb b/docs/sources/user_guide/feature_extraction/PrincipalComponentAnalysis.ipynb
@@ -847,7 +847,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.5"
+   "version": "3.8.2"
   },
   "toc": {
    "nav_menu": {},

diff --git a/docs/sources/user_guide/feature_extraction/RBFKernelPCA.ipynb b/docs/sources/user_guide/feature_extraction/RBFKernelPCA.ipynb
@@ -4,7 +4,10 @@
    "cell_type": "code",
    "execution_count": 1,
    "metadata": {
-    "collapsed": true
+    "collapsed": true,
+    "jupyter": {
+     "outputs_hidden": true
+    }
    },
    "outputs": [],
    "source": [
@@ -492,7 +495,10 @@
    "cell_type": "code",
    "execution_count": 9,
    "metadata": {
-    "collapsed": true
+    "collapsed": true,
+    "jupyter": {
+     "outputs_hidden": true
+    }
    },
    "outputs": [],
    "source": [
@@ -685,7 +691,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.4"
+   "version": "3.8.2"
   },
   "toc": {
    "nav_menu": {},
@@ -701,5 +707,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 4
 }