From 225e0647b72bfa376fde2d07b436b1d9b64a2b7f Mon Sep 17 00:00:00 2001 From: Brian Kroth Date: Wed, 7 Aug 2024 21:24:57 +0000 Subject: [PATCH 1/3] Simplify dependencies --- mlos_core/setup.py | 8 +------- mlos_viz/setup.py | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/mlos_core/setup.py b/mlos_core/setup.py index 87ad871dbce..c584a2a6cff 100644 --- a/mlos_core/setup.py +++ b/mlos_core/setup.py @@ -89,15 +89,9 @@ def _get_long_desc_from_readme(base_url: str) -> dict: version=VERSION, install_requires=[ "scikit-learn>=1.2", - # CVE-2022-21797: scikit-learn dependency, addressed in 1.2.0dev0, which - # isn't currently released - "joblib>=1.1.1", "scipy>=1.3.2", "numpy>=1.24", - "numpy<2.0.0", # FIXME: https://github.com/numpy/numpy/issues/26710 - 'pandas >= 2.2.0;python_version>="3.9"', - 'Bottleneck > 1.3.5;python_version>="3.9"', - 'pandas >= 1.0.3;python_version<"3.9"', + "pandas>=2.2.0", "ConfigSpace>=1.0", ], extras_require=extra_requires, diff --git a/mlos_viz/setup.py b/mlos_viz/setup.py index 06eee2ba590..fb07aa92d5c 100644 --- a/mlos_viz/setup.py +++ b/mlos_viz/setup.py @@ -83,8 +83,7 @@ def _get_long_desc_from_readme(base_url: str) -> dict: version=VERSION, install_requires=[ "mlos-bench==" + VERSION, - "dabl>=0.2.6", - "matplotlib<3.9", # FIXME: https://github.com/dabl/dabl/pull/341 + "dabl>=0.3.1", "seaborn>=0.12.2", ], extras_require=extra_requires, From 7b8af11f749c2503a6887aee894455961186a232 Mon Sep 17 00:00:00 2001 From: Brian Kroth Date: Wed, 7 Aug 2024 21:30:15 +0000 Subject: [PATCH 2/3] add back matplotlib, but without a version requirement --- mlos_viz/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mlos_viz/setup.py b/mlos_viz/setup.py index fb07aa92d5c..c1cf74cb28a 100644 --- a/mlos_viz/setup.py +++ b/mlos_viz/setup.py @@ -84,6 +84,7 @@ def _get_long_desc_from_readme(base_url: str) -> dict: install_requires=[ "mlos-bench==" + VERSION, "dabl>=0.3.1", + "matplotlib", "seaborn>=0.12.2", ], extras_require=extra_requires, From b8b10f647db3ecbacc711bbf4105281df5a86391 Mon Sep 17 00:00:00 2001 From: Brian Kroth Date: Wed, 7 Aug 2024 21:42:14 +0000 Subject: [PATCH 3/3] fixups --- mlos_core/setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mlos_core/setup.py b/mlos_core/setup.py index c584a2a6cff..61f3b8945f5 100644 --- a/mlos_core/setup.py +++ b/mlos_core/setup.py @@ -88,10 +88,11 @@ def _get_long_desc_from_readme(base_url: str) -> dict: setup( version=VERSION, install_requires=[ - "scikit-learn>=1.2", + "scikit-learn>=1.3", "scipy>=1.3.2", "numpy>=1.24", - "pandas>=2.2.0", + 'pandas >= 2.2.0;python_version>="3.9"', + 'pandas >= 1.0.3;python_version<"3.9"', "ConfigSpace>=1.0", ], extras_require=extra_requires,