From 40f3111ee1558eeed16eba2ddfadbe1c477de760 Mon Sep 17 00:00:00 2001 From: MichaelFu512 Date: Tue, 11 Jun 2024 13:17:14 -0700 Subject: [PATCH 1/7] dependency --- .../dependency_update_check/latest_dependency_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evalml/tests/dependency_update_check/latest_dependency_versions.txt b/evalml/tests/dependency_update_check/latest_dependency_versions.txt index cf73c73180..cbb10e967b 100644 --- a/evalml/tests/dependency_update_check/latest_dependency_versions.txt +++ b/evalml/tests/dependency_update_check/latest_dependency_versions.txt @@ -25,12 +25,12 @@ pandas==2.0.3 plotly==5.22.0 pmdarima==2.0.4 pyzmq==26.0.3 -scikit-learn==1.4.2 +scikit-learn==1.5.0 scikit-optimize==0.10.2 scipy==1.13.1 seaborn==0.13.2 shap==0.45.1 -sktime==0.28.1 +sktime==0.30.1 statsmodels==0.14.2 texttable==1.7.0 tomli==2.0.1 From c3a5faf5163bbb8471da817cb496d21d32c742c1 Mon Sep 17 00:00:00 2001 From: MichaelFu512 Date: Tue, 11 Jun 2024 13:43:21 -0700 Subject: [PATCH 2/7] pin networks since v3.3 doesn't support python3.9 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e410a830fa..429feb0f4f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ dependencies = [ "distributed >= 2022.2.0, != 2022.10.1", "featuretools[dask] >= 1.16.0", "nlp-primitives >= 2.9.0", - "networkx >= 2.7", + "networkx >= 2.7", <= 3.2.1, "plotly >= 5.0.0", "kaleido >= 0.2.0", "ipywidgets >= 7.5", From ff794f42cbbdfeb1e313a0889a1102ce97a9b14a Mon Sep 17 00:00:00 2001 From: MichaelFu512 Date: Tue, 11 Jun 2024 14:43:35 -0700 Subject: [PATCH 3/7] release notes --- docs/source/release_notes.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst index 54cebcbaa1..ed4cc6c2ad 100644 --- a/docs/source/release_notes.rst +++ b/docs/source/release_notes.rst @@ -3,6 +3,7 @@ Release Notes **Future Releases** * Enhancements * Fixes + * Updated sktime and scikit-learn latest dependency version :pr:`4449` * Changes * Documentation Changes * Testing Changes From 36401dfc69e2e4e824a6de6a9144c2b619cceebe Mon Sep 17 00:00:00 2001 From: MichaelFu512 Date: Tue, 11 Jun 2024 14:45:27 -0700 Subject: [PATCH 4/7] pyproject --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 429feb0f4f..aa6bff7c84 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ dependencies = [ "distributed >= 2022.2.0, != 2022.10.1", "featuretools[dask] >= 1.16.0", "nlp-primitives >= 2.9.0", - "networkx >= 2.7", <= 3.2.1, + "networkx >= 2.7, <= 3.2.1", "plotly >= 5.0.0", "kaleido >= 0.2.0", "ipywidgets >= 7.5", From ad25136040655aefc821b0b7ce58d0f23a067cce Mon Sep 17 00:00:00 2001 From: MichaelFu512 Date: Wed, 12 Jun 2024 11:16:52 -0700 Subject: [PATCH 5/7] update meta and min reqs --- .github/meta.yaml | 4 ++-- core-requirements.txt | 2 +- .../tests/dependency_update_check/minimum_requirements.txt | 2 +- .../dependency_update_check/minimum_test_requirements.txt | 2 +- pyproject.toml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/meta.yaml b/.github/meta.yaml index 26b4c2fd3a..010061ea2c 100644 --- a/.github/meta.yaml +++ b/.github/meta.yaml @@ -28,7 +28,7 @@ outputs: - pandas >=1.5.0, <2.1.0 - dask >=2022.2.0, !=2022.10.1 - scipy >=1.5.0 - - scikit-learn >=1.3.2 + - scikit-learn >=1.4.2 - scikit-optimize >=0.9.0 - statsmodels >=0.12.2 - colorama >=0.4.4 @@ -40,7 +40,7 @@ outputs: - featuretools >=1.16.0 - nlp-primitives >=2.9.0 - python >=3.9.* - - networkx >=2.7 + - networkx >=2.7, <=3.2.1 - category_encoders >=2.2.2, <=2.5.1.post0 - python-graphviz >=0.13 - tomli >=2.0.1 diff --git a/core-requirements.txt b/core-requirements.txt index 6486d20a3b..5950386d17 100644 --- a/core-requirements.txt +++ b/core-requirements.txt @@ -1,7 +1,7 @@ numpy>=1.21.0 pandas>=1.5.0, <2.1.0 scipy>=1.5.0 -scikit-learn>=1.3.2 +scikit-learn>=1.4.2 scikit-optimize>=0.9.0 pyzmq>=20.0.0 colorama>=0.4.4 diff --git a/evalml/tests/dependency_update_check/minimum_requirements.txt b/evalml/tests/dependency_update_check/minimum_requirements.txt index 0b059e6bee..7fffd6a0f7 100644 --- a/evalml/tests/dependency_update_check/minimum_requirements.txt +++ b/evalml/tests/dependency_update_check/minimum_requirements.txt @@ -23,7 +23,7 @@ pandas==1.5.0 plotly==5.0.0 pmdarima==1.8.5 pyzmq==20.0.0 -scikit-learn==1.3.2 +scikit-learn==1.4.2 scikit-optimize==0.9.0 scipy==1.5.0 seaborn==0.11.1 diff --git a/evalml/tests/dependency_update_check/minimum_test_requirements.txt b/evalml/tests/dependency_update_check/minimum_test_requirements.txt index 2be6d022c7..7b5ad97188 100644 --- a/evalml/tests/dependency_update_check/minimum_test_requirements.txt +++ b/evalml/tests/dependency_update_check/minimum_test_requirements.txt @@ -31,7 +31,7 @@ pytest-timeout==1.4.2 pytest-xdist==2.1.0 pytest==7.1.2 pyzmq==20.0.0 -scikit-learn==1.3.2 +scikit-learn==1.4.2 scikit-optimize==0.9.0 scipy==1.5.0 seaborn==0.11.1 diff --git a/pyproject.toml b/pyproject.toml index aa6bff7c84..22e7b16148 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,12 +27,12 @@ maintainers = [ ] keywords = ["data science", "machine learning", "optimization", "automl"] license = {file = "LICENSE"} -requires-python = ">=3.9,<4" +requires-python = ">=3.9,<=3.11" dependencies = [ "numpy >= 1.22.0", - "pandas >= 1.5.0, <2.1.0", + "pandas >= 1.5.0, < 2.1.0", "scipy >= 1.5.0", - "scikit-learn >= 1.3.2", + "scikit-learn >= 1.4.2", "scikit-optimize >= 0.9.0", "pyzmq >= 20.0.0", "colorama >= 0.4.4", From 0489b9b1d8a3eee0953a0a28ca819d15ca6482d2 Mon Sep 17 00:00:00 2001 From: MichaelFu512 Date: Wed, 12 Jun 2024 11:22:49 -0700 Subject: [PATCH 6/7] revert --- .github/meta.yaml | 2 +- core-requirements.txt | 2 +- evalml/tests/dependency_update_check/minimum_requirements.txt | 2 +- .../dependency_update_check/minimum_test_requirements.txt | 2 +- pyproject.toml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/meta.yaml b/.github/meta.yaml index 010061ea2c..800145bf10 100644 --- a/.github/meta.yaml +++ b/.github/meta.yaml @@ -28,7 +28,7 @@ outputs: - pandas >=1.5.0, <2.1.0 - dask >=2022.2.0, !=2022.10.1 - scipy >=1.5.0 - - scikit-learn >=1.4.2 + - scikit-learn >=1.3.2 - scikit-optimize >=0.9.0 - statsmodels >=0.12.2 - colorama >=0.4.4 diff --git a/core-requirements.txt b/core-requirements.txt index 5950386d17..6486d20a3b 100644 --- a/core-requirements.txt +++ b/core-requirements.txt @@ -1,7 +1,7 @@ numpy>=1.21.0 pandas>=1.5.0, <2.1.0 scipy>=1.5.0 -scikit-learn>=1.4.2 +scikit-learn>=1.3.2 scikit-optimize>=0.9.0 pyzmq>=20.0.0 colorama>=0.4.4 diff --git a/evalml/tests/dependency_update_check/minimum_requirements.txt b/evalml/tests/dependency_update_check/minimum_requirements.txt index 7fffd6a0f7..0b059e6bee 100644 --- a/evalml/tests/dependency_update_check/minimum_requirements.txt +++ b/evalml/tests/dependency_update_check/minimum_requirements.txt @@ -23,7 +23,7 @@ pandas==1.5.0 plotly==5.0.0 pmdarima==1.8.5 pyzmq==20.0.0 -scikit-learn==1.4.2 +scikit-learn==1.3.2 scikit-optimize==0.9.0 scipy==1.5.0 seaborn==0.11.1 diff --git a/evalml/tests/dependency_update_check/minimum_test_requirements.txt b/evalml/tests/dependency_update_check/minimum_test_requirements.txt index 7b5ad97188..2be6d022c7 100644 --- a/evalml/tests/dependency_update_check/minimum_test_requirements.txt +++ b/evalml/tests/dependency_update_check/minimum_test_requirements.txt @@ -31,7 +31,7 @@ pytest-timeout==1.4.2 pytest-xdist==2.1.0 pytest==7.1.2 pyzmq==20.0.0 -scikit-learn==1.4.2 +scikit-learn==1.3.2 scikit-optimize==0.9.0 scipy==1.5.0 seaborn==0.11.1 diff --git a/pyproject.toml b/pyproject.toml index 22e7b16148..27394fb2e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,9 +30,9 @@ license = {file = "LICENSE"} requires-python = ">=3.9,<=3.11" dependencies = [ "numpy >= 1.22.0", - "pandas >= 1.5.0, < 2.1.0", + "pandas >= 1.5.0, <2.1.0", "scipy >= 1.5.0", - "scikit-learn >= 1.4.2", + "scikit-learn >= 1.3.2", "scikit-optimize >= 0.9.0", "pyzmq >= 20.0.0", "colorama >= 0.4.4", From d5cb9901a24f99a9eeefe1a1376c75d2c010de06 Mon Sep 17 00:00:00 2001 From: MichaelFu512 Date: Wed, 12 Jun 2024 11:29:28 -0700 Subject: [PATCH 7/7] revert revert --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 27394fb2e4..aa6bff7c84 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ maintainers = [ ] keywords = ["data science", "machine learning", "optimization", "automl"] license = {file = "LICENSE"} -requires-python = ">=3.9,<=3.11" +requires-python = ">=3.9,<4" dependencies = [ "numpy >= 1.22.0", "pandas >= 1.5.0, <2.1.0",