Skip to content

Commit

Permalink
Update make_ecommerce_entityset to allow use without Dask (#2677)
Browse files Browse the repository at this point in the history
* update make_ecommerce_entityset

* update release notes

* fix spark min requirements

* try to remove tsfresh from complete

* fix dask
  • Loading branch information
thehomebrewnerd authored Feb 23, 2024
1 parent bcffef4 commit 18083b3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
8 changes: 5 additions & 3 deletions docs/source/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
====================
Expand Down
Original file line number Diff line number Diff line change
@@ -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
8 changes: 5 additions & 3 deletions featuretools/tests/testing_utils/mock_ds.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import numpy as np
import pandas as pd
import pytest
from woodwork.logical_types import (
URL,
Boolean,
Expand All @@ -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):
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit 18083b3

Please sign in to comment.