Merge branch 'main' into latest-dep-update-c284c2d

alteryx · Sep 6, 2023 · 5fc22bf · 5fc22bf
2 parents b56d50b + 3d5923d
commit 5fc22bf
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst
@@ -10,6 +10,7 @@ Future Release
     * Changes
         * Refactor ``can_stack_primitive_on_inputs`` (:pr:`2522`)
         * Update s3 bucket for docs image (:pr:`2593`)
+        * Temporarily restrict pandas max version to ``<2.1.0`` and pyarrow to ``<13.0.0`` (:pr:`2609`)
     * Documentation Changes
         * Fix badge on README for tests (:pr:`2598`)
         * Update readthedocs config to use build.os (:pr:`2601`)

diff --git a/featuretools/computational_backends/utils.py b/featuretools/computational_backends/utils.py
@@ -22,7 +22,7 @@
 
 def bin_cutoff_times(cutoff_time, bin_size):
     binned_cutoff_time = cutoff_time.ww.copy()
-    if type(bin_size) == int:
+    if isinstance(bin_size, int):
         binned_cutoff_time["time"] = binned_cutoff_time["time"].apply(
             lambda x: x / bin_size * bin_size,
         )

diff --git a/featuretools/feature_base/feature_base.py b/featuretools/feature_base/feature_base.py
@@ -190,7 +190,7 @@ def _check_input_types(self):
 
         input_types = self.primitive.input_types
         if input_types is not None:
-            if type(input_types[0]) != list:
+            if not isinstance(input_types[0], list):
                 input_types = [input_types]
 
             for t in input_types:

diff --git a/featuretools/primitives/standard/transform/natural_language/count_string.py b/featuretools/primitives/standard/transform/natural_language/count_string.py
@@ -99,7 +99,7 @@ def process_text(self, text):
 
     def get_function(self):
         def count_string(words):
-            if type(words) != str:
+            if not isinstance(words, str):
                 return np.nan
             words = self.process_text(words)
             return len(re.findall(self.pattern, words))

diff --git a/featuretools/tests/primitive_tests/test_agg_feats.py b/featuretools/tests/primitive_tests/test_agg_feats.py
@@ -211,7 +211,7 @@ def test_init_and_name(es):
 
     for agg_prim in agg_primitives:
         input_types = agg_prim.input_types
-        if type(input_types[0]) != list:
+        if not isinstance(input_types[0], list):
             input_types = [input_types]
 
         # test each allowed input_types for this primitive

diff --git a/featuretools/tests/primitive_tests/test_transform_features.py b/featuretools/tests/primitive_tests/test_transform_features.py
@@ -137,7 +137,7 @@ def test_init_and_name(es):
 
         # use the input_types matching function from DFS
         input_types = transform_prim.input_types
-        if type(input_types[0]) == list:
+        if isinstance(input_types[0], list):
             matching_inputs = match(input_types[0], features_to_use)
         else:
             matching_inputs = match(input_types, features_to_use)

diff --git a/pyproject.toml b/pyproject.toml
@@ -34,7 +34,7 @@ dependencies = [
     "holidays >= 0.13",
     "numpy >= 1.21.0",
     "packaging >= 20.0",
-    "pandas >= 1.5.0",
+    "pandas >= 1.5.0,<2.1.0",
     "psutil >= 5.6.6",
     "scipy >= 1.10.0",
     "tqdm >= 4.32.0",
@@ -56,7 +56,7 @@ test = [
     "graphviz >= 0.8.4",
     "moto[all] >= 3.0.7",
     "pip >= 21.3.1",
-    "pyarrow >= 3.0.0",
+    "pyarrow >= 3.0.0,<13.0.0",
     "pympler >= 0.8",
     "pytest >= 7.1.2",
     "pytest-cov >= 3.0.0",
@@ -75,6 +75,7 @@ spark = [
     "pyspark >= 3.2.2",
     "numpy < 1.24.0",
     "pandas < 2.0.0",
+    "pyarrow < 13.0.0",
 ]
 updater = [
     "alteryx-open-src-update-checker >= 2.1.0"