diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst index 2ab5424e10..124e3afcc4 100644 --- a/docs/source/release_notes.rst +++ b/docs/source/release_notes.rst @@ -3,15 +3,17 @@ Release Notes ------------- -.. Future Release - ============== +Future Release +============== * Enhancements * Fixes * Changes * Documentation Changes * Testing Changes + * Update ``make_ecommerce_entityset`` to work without Dask (:pr:`2677`) -.. Thanks to the following people for contributing to this release: + Thanks to the following people for contributing to this release: + :user:`thehomebrewnerd` v1.29.0 Feb 16, 2024 ==================== diff --git a/featuretools/tests/requirement_files/minimum_spark_requirements.txt b/featuretools/tests/requirement_files/minimum_spark_requirements.txt index e191dec6c9..13283a7702 100644 --- a/featuretools/tests/requirement_files/minimum_spark_requirements.txt +++ b/featuretools/tests/requirement_files/minimum_spark_requirements.txt @@ -1,12 +1,12 @@ cloudpickle==1.5.0 holidays==0.17 -numpy==1.21.0 +numpy==1.25.0 packaging==20.0 -pandas==1.5.0 +pandas==2.0.0 psutil==5.6.6 pyarrow==14.0.1 -pyspark==3.2.2 +pyspark==3.5.0 scipy==1.10.0 tqdm==4.32.0 -woodwork==0.23.0 -woodwork[spark]==0.23.0 +woodwork==0.28.0 +woodwork[spark]==0.28.0 diff --git a/featuretools/tests/testing_utils/mock_ds.py b/featuretools/tests/testing_utils/mock_ds.py index 3fd8ba6dbe..8f0285cc2d 100644 --- a/featuretools/tests/testing_utils/mock_ds.py +++ b/featuretools/tests/testing_utils/mock_ds.py @@ -2,7 +2,6 @@ import numpy as np import pandas as pd -import pytest from woodwork.logical_types import ( URL, Boolean, @@ -24,6 +23,9 @@ ) from featuretools.entityset import EntitySet +from featuretools.utils.gen_utils import import_or_none + +dask = import_or_none("dask") def make_ecommerce_entityset(with_integer_time_index=False): @@ -37,8 +39,8 @@ def make_ecommerce_entityset(with_integer_time_index=False): \\ / . L Log """ - dask = pytest.importorskip("dask", reason="Dask not installed, skipping") - dask.config.set({"dataframe.convert-string": False}) + if dask: + dask.config.set({"dataframe.convert-string": False}) dataframes = make_ecommerce_dataframes( with_integer_time_index=with_integer_time_index, diff --git a/pyproject.toml b/pyproject.toml index ec823285a9..1d4dad6674 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,8 +70,8 @@ dask = [ "woodwork[dask] >= 0.23.0", ] spark = [ - "woodwork[spark] >= 0.23.0", - "pyspark >= 3.2.2", + "woodwork[spark] >= 0.28.0", + "pyspark >= 3.5.0", "pyarrow >= 14.0.1", ] updater = [ @@ -112,7 +112,7 @@ dev = [ "featuretools[docs,dask,spark,test]", ] complete = [ - "featuretools[autonormalize,sklearn,dask,spark,sql,tsfresh,updater]", + "featuretools[autonormalize,sklearn,dask,spark,sql,updater]", ] [tool.setuptools]