Merge remote-tracking branch 'upstream/master' into isolate-tqdm

fkiraly · fkiraly · commit 89e0df96ab41 · 2025-06-14T19:47:42.000+02:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -41,11 +41,12 @@ dependencies = [
   "pandas <3.0.0",
   "gradient-free-optimizers >=1.2.4, <2.0.0",
   "scikit-base <1.0.0",
+  "scikit-learn <1.7.0",
 ]
 
 [project.optional-dependencies]
 sklearn-integration = [
-  "scikit-learn<1.7.0",
+  "scikit-learn <1.7.0",
 ]
 build = [
   "setuptools",

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,12 @@ dependencies = [`
`41`	`41`	`"pandas <3.0.0",`
`42`	`42`	`"gradient-free-optimizers >=1.2.4, <2.0.0",`
`43`	`43`	`"scikit-base <1.0.0",`
	`44`	`+ "scikit-learn <1.7.0",`
`44`	`45`	`]`
`45`	`46`
`46`	`47`	`[project.optional-dependencies]`
`47`	`48`	`sklearn-integration = [`
`48`		`- "scikit-learn<1.7.0",`
	`49`	`+ "scikit-learn <1.7.0",`
`49`	`50`	`]`
`50`	`51`	`build = [`
`51`	`52`	`"setuptools",`