Merge branch 'scikit-learn:main' into fork

neurodata · Apr 24, 2023 · 558be0a · 558be0a
2 parents d2e88c0 + 89ff82c
commit 558be0a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/doc/jupyter-lite.json b/doc/jupyter-lite.json
@@ -0,0 +1,10 @@
+{
+  "jupyter-lite-schema-version": 0,
+  "jupyter-config-data": {
+    "litePluginSettings": {
+      "@jupyterlite/pyodide-kernel-extension:kernel": {
+        "pyodideUrl": "https://cdn.jsdelivr.net/pyodide/v0.23.1/full/pyodide.js"
+      }
+    }
+  }
+} 
diff --git a/doc/jupyter_lite_config.json b/doc/jupyter_lite_config.json
@@ -0,0 +1,5 @@
+{
+  "LiteBuildConfig": {
+    "no_sourcemaps": true
+  }
+}
diff --git a/examples/neighbors/plot_nearest_centroid.py b/examples/neighbors/plot_nearest_centroid.py
@@ -15,7 +15,6 @@
 from sklearn_fork.neighbors import NearestCentroid
 from sklearn_fork.inspection import DecisionBoundaryDisplay
 
-n_neighbors = 15
 
 # import some data to play with
 iris = datasets.load_iris()
@@ -29,7 +28,7 @@
 cmap_bold = ListedColormap(["darkorange", "c", "darkblue"])
 
 for shrinkage in [None, 0.2]:
-    # we create an instance of Neighbours Classifier and fit the data.
+    # we create an instance of Nearest Centroid Classifier and fit the data.
     clf = NearestCentroid(shrink_threshold=shrinkage)
     clf.fit(X, y)
     y_pred = clf.predict(X)

diff --git a/examples/preprocessing/plot_target_encoder_cross_val.py b/examples/preprocessing/plot_target_encoder_cross_val.py
@@ -158,3 +158,8 @@
 # :class:`TargetEncoder` is a part of a :class:`~sklearn_fork.pipeline.Pipeline` and the
 # pipeline is fitted, the pipeline will correctly call
 # :meth:`TargetEncoder.fit_transform` and pass the encoding along.
+
+# %%
+# This resets `transform_output` to its default value to avoid impacting other
+# examples when generating the scikit-learn documentation
+sklearn.set_config(transform_output="default")