From 051284bfeed7fff0758d76fe6875cb91f66f50ef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 20:04:52 +0000 Subject: [PATCH 1/6] Update latest dependencies --- .../latest_dependency_versions.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/evalml/tests/dependency_update_check/latest_dependency_versions.txt b/evalml/tests/dependency_update_check/latest_dependency_versions.txt index 009e746943..bfc6b4a1fa 100644 --- a/evalml/tests/dependency_update_check/latest_dependency_versions.txt +++ b/evalml/tests/dependency_update_check/latest_dependency_versions.txt @@ -1,30 +1,30 @@ -black==24.4.2 +black==24.8.0 catboost==1.2.5 category-encoders==2.5.1.post0 click==8.1.7 cloudpickle==3.0.0 colorama==0.4.6 -dask==2024.6.2 -dask-expr==1.1.6 -distributed==2024.6.2 +dask==2024.8.0 +dask-expr==1.1.10 +distributed==2024.8.0 featuretools==1.31.0 graphviz==0.20.3 -holidays==0.52 +holidays==0.55 imbalanced-learn==0.12.3 ipywidgets==8.1.3 kaleido==0.2.1 -lightgbm==4.4.0 +lightgbm==4.5.0 lime==0.2.0.1 -matplotlib==3.9.1 +matplotlib==3.9.2 matplotlib-inline==0.1.7 networkx==3.2.1 nlp-primitives==2.13.0 numpy==1.26.4 packaging==24.1 pandas==2.0.3 -plotly==5.22.0 +plotly==5.23.0 pmdarima==2.0.4 -pyzmq==26.0.3 +pyzmq==26.1.1 scikit-learn==1.4.2 scikit-optimize==0.10.2 scipy==1.13.1 @@ -35,4 +35,4 @@ statsmodels==0.14.2 texttable==1.7.0 tomli==2.0.1 woodwork==0.31.0 -xgboost==2.1.0 +xgboost==2.1.1 From 527de53f238a7a1c5218e1d8b69b50088961e0a2 Mon Sep 17 00:00:00 2001 From: eccabay Date: Wed, 21 Aug 2024 16:44:05 -0500 Subject: [PATCH 2/6] Lint fixes and exclusions for docs with ruff --- docs/source/user_guide/automl.ipynb | 8 +++++--- docs/source/user_guide/data_check_actions.ipynb | 1 - docs/source/user_guide/data_checks.ipynb | 2 +- docs/source/user_guide/model_understanding.ipynb | 2 -- docs/source/user_guide/pipelines.ipynb | 2 -- docs/source/user_guide/timeseries.ipynb | 2 +- pyproject.toml | 3 +-- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/docs/source/user_guide/automl.ipynb b/docs/source/user_guide/automl.ipynb index 245e7c13ab..83563ec417 100644 --- a/docs/source/user_guide/automl.ipynb +++ b/docs/source/user_guide/automl.ipynb @@ -266,9 +266,6 @@ "metadata": {}, "outputs": [], "source": [ - "from evalml.pipelines import MulticlassClassificationPipeline\n", - "\n", - "\n", "automl_custom = evalml.automl.AutoMLSearch(\n", " X_train=X_train,\n", " y_train=y_train,\n", @@ -368,6 +365,11 @@ "metadata": {}, "outputs": [], "source": [ + "import logging\n", + "\n", + "logger = logging.getLogger(__name__)\n", + "\n", + "\n", "# error_callback example; this is implemented in the evalml library\n", "def raise_error_callback(exception, traceback, automl, **kwargs):\n", " \"\"\"Raises the exception thrown by the AutoMLSearch object. Also logs the exception as an error.\"\"\"\n", diff --git a/docs/source/user_guide/data_check_actions.ipynb b/docs/source/user_guide/data_check_actions.ipynb index 130ba38f0d..2ca115d14b 100644 --- a/docs/source/user_guide/data_check_actions.ipynb +++ b/docs/source/user_guide/data_check_actions.ipynb @@ -32,7 +32,6 @@ "outputs": [], "source": [ "import woodwork as ww\n", - "import pandas as pd\n", "from evalml import AutoMLSearch\n", "from evalml.demos import load_fraud\n", "from evalml.preprocessing import split_data" diff --git a/docs/source/user_guide/data_checks.ipynb b/docs/source/user_guide/data_checks.ipynb index 51c14a3cad..26f9519b46 100644 --- a/docs/source/user_guide/data_checks.ipynb +++ b/docs/source/user_guide/data_checks.ipynb @@ -688,7 +688,7 @@ "metadata": {}, "outputs": [], "source": [ - "from evalml.data_checks import NoVarianceDataCheck, DataCheckWarning\n", + "from evalml.data_checks import NoVarianceDataCheck, DataCheckError\n", "\n", "X = pd.DataFrame(\n", " {\n", diff --git a/docs/source/user_guide/model_understanding.ipynb b/docs/source/user_guide/model_understanding.ipynb index 2a39950030..66a800cf8d 100644 --- a/docs/source/user_guide/model_understanding.ipynb +++ b/docs/source/user_guide/model_understanding.ipynb @@ -928,8 +928,6 @@ "metadata": {}, "outputs": [], "source": [ - "import shap\n", - "\n", "from evalml.model_understanding.force_plots import graph_force_plot\n", "\n", "rows_to_explain = [0] # Should be a list of integer indices of the rows to explain.\n", diff --git a/docs/source/user_guide/pipelines.ipynb b/docs/source/user_guide/pipelines.ipynb index 8dabdee3b2..7549cb3873 100644 --- a/docs/source/user_guide/pipelines.ipynb +++ b/docs/source/user_guide/pipelines.ipynb @@ -586,9 +586,7 @@ "source": [ "from evalml.pipelines.utils import generate_pipeline_code\n", "from evalml.pipelines import BinaryClassificationPipeline\n", - "import pandas as pd\n", "from evalml.utils import infer_feature_types\n", - "from skopt.space import Integer\n", "\n", "\n", "class MyDropNullColumns(Transformer):\n", diff --git a/docs/source/user_guide/timeseries.ipynb b/docs/source/user_guide/timeseries.ipynb index ab899a72bd..eaabcc63cd 100644 --- a/docs/source/user_guide/timeseries.ipynb +++ b/docs/source/user_guide/timeseries.ipynb @@ -496,7 +496,7 @@ "outputs": [], "source": [ "stl = STLDecomposer()\n", - "assert stl.period == None\n", + "assert stl.period is None\n", "stl.fit(X_stl, y_stl)\n", "print(stl.period)" ] diff --git a/pyproject.toml b/pyproject.toml index d72780bec0..d51b146f55 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,6 @@ dependencies = [ "lime >= 0.2.0.1", "tomli >= 2.0.1", "packaging >= 23.0", - "black[jupyter] >= 22.3.0", "holidays >= 0.13" ] @@ -171,7 +170,7 @@ src = ["evalml"] "evalml/tests/**" = ["D"] "evalml/utils/**" = ["D"] ".github/**" = ["D"] -"docs/**" = ["D"] +"docs/**" = ["D", "I001", "E402", "F811", "F401"] [tool.ruff.lint.isort] known-first-party = ["evalml"] From 04b7adcea1a7bb9c2e7ad944f49f662c84f3a3f6 Mon Sep 17 00:00:00 2001 From: eccabay Date: Wed, 21 Aug 2024 16:52:08 -0500 Subject: [PATCH 3/6] Workaround for nltk issue --- .../test_partial_dependence.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/evalml/tests/model_understanding_tests/test_partial_dependence.py b/evalml/tests/model_understanding_tests/test_partial_dependence.py index efffe69a74..c566e6fcef 100644 --- a/evalml/tests/model_understanding_tests/test_partial_dependence.py +++ b/evalml/tests/model_understanding_tests/test_partial_dependence.py @@ -2881,11 +2881,14 @@ def test_partial_dependence_dfs_transformer_handling_with_multi_output_primitive index="index", make_index=True, ) - X_fm, features = ft.dfs( - entityset=es, - target_dataframe_name="X", - trans_primitives=["LSA"], - ) + try: + X_fm, features = ft.dfs( + entityset=es, + target_dataframe_name="X", + trans_primitives=["LSA"], + ) + except ValueError: + pytest.xfail("NLTK bug within nlp-primitives") dfs_transformer = DFSTransformer(features=features) pipeline = RegressionPipeline( From 18819bab223960a22401c9e0cbf595cf56a58c7f Mon Sep 17 00:00:00 2001 From: eccabay Date: Wed, 21 Aug 2024 16:53:28 -0500 Subject: [PATCH 4/6] Add back accidentally removed line --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index d51b146f55..dd988da6d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,6 +63,7 @@ dependencies = [ "lime >= 0.2.0.1", "tomli >= 2.0.1", "packaging >= 23.0", + "black[jupyter] >= 22.3.0", "holidays >= 0.13" ] From 2d1f9bf1d9e8d1c0ab29857ef3893af574d8f23f Mon Sep 17 00:00:00 2001 From: eccabay Date: Fri, 23 Aug 2024 14:16:38 -0500 Subject: [PATCH 5/6] Pin pytest version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index dd988da6d5..1baa375488 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,7 +77,7 @@ dependencies = [ [project.optional-dependencies] test = [ - "pytest >= 7.1.2", + "pytest >= 7.1.2, < 8.3.0", "pytest-xdist >= 2.1.0", "pytest-timeout >= 1.4.2", "pytest-cov >= 2.10.1", From e14e9441e0cf05c05360ec23ea144cd17f010931 Mon Sep 17 00:00:00 2001 From: eccabay Date: Fri, 23 Aug 2024 14:21:19 -0500 Subject: [PATCH 6/6] More latest deps changes --- .../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 bfc6b4a1fa..ee5697b002 100644 --- a/evalml/tests/dependency_update_check/latest_dependency_versions.txt +++ b/evalml/tests/dependency_update_check/latest_dependency_versions.txt @@ -11,7 +11,7 @@ featuretools==1.31.0 graphviz==0.20.3 holidays==0.55 imbalanced-learn==0.12.3 -ipywidgets==8.1.3 +ipywidgets==8.1.5 kaleido==0.2.1 lightgbm==4.5.0 lime==0.2.0.1 @@ -24,7 +24,7 @@ packaging==24.1 pandas==2.0.3 plotly==5.23.0 pmdarima==2.0.4 -pyzmq==26.1.1 +pyzmq==26.2.0 scikit-learn==1.4.2 scikit-optimize==0.10.2 scipy==1.13.1