Merge branch 'main' of https://github.com/coiled/dask-snowflake into …

…nick-amplify/main
coiled · Mar 15, 2024 · 05527fc · 05527fc
2 parents 9f99a28 + a56fe3f
commit 05527fc
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 12 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,6 +15,11 @@ jobs:
       matrix:
         os: ["windows-latest", "ubuntu-latest", "macos-latest"]
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        exclude:
+          # Python 3.11 build on macOS times out for some reason
+          # xref https://github.com/coiled/dask-snowflake/pull/56
+          - os: macos-latest
+            python-version: "3.11"
 
     steps:
       - name: Checkout source

diff --git a/ci/environment-3.10.yaml b/ci/environment-3.10.yaml
@@ -6,8 +6,12 @@ dependencies:
   - python=3.10
   - dask
   - distributed
-  - pandas
-  - pyarrow<11
+  # `pandas=2.2` dropped support for `sqlalchemy<2`, but `snowflake-sqlalchemy`
+  # doesn't support `sqlalchemy>=2` yet. Temporarily pinning `pandas<2.2` for now.
+  # xref https://github.com/pandas-dev/pandas/issues/57049
+  # xref https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380
+  - pandas<2.2
+  - pyarrow
   - snowflake-connector-python >=2.6.0
   - snowflake-sqlalchemy
   # Testing

diff --git a/ci/environment-3.11.yaml b/ci/environment-3.11.yaml
@@ -6,8 +6,12 @@ dependencies:
   - python=3.11
   - dask
   - distributed
-  - pandas
-  - pyarrow<11
+  # `pandas=2.2` dropped support for `sqlalchemy<2`, but `snowflake-sqlalchemy`
+  # doesn't support `sqlalchemy>=2` yet. Temporarily pinning `pandas<2.2` for now.
+  # xref https://github.com/pandas-dev/pandas/issues/57049
+  # xref https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380
+  - pandas<2.2
+  - pyarrow
   - snowflake-connector-python >=2.6.0
   - snowflake-sqlalchemy
   # Testing

diff --git a/ci/environment-3.7.yaml b/ci/environment-3.7.yaml
@@ -6,8 +6,12 @@ dependencies:
   - python=3.7
   - dask
   - distributed
-  - pandas
-  - pyarrow<11
+  # `pandas=2.2` dropped support for `sqlalchemy<2`, but `snowflake-sqlalchemy`
+  # doesn't support `sqlalchemy>=2` yet. Temporarily pinning `pandas<2.2` for now.
+  # xref https://github.com/pandas-dev/pandas/issues/57049
+  # xref https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380
+  - pandas<2.2
+  - pyarrow
   - snowflake-connector-python >=2.6.0
   - snowflake-sqlalchemy
   # Testing

diff --git a/ci/environment-3.8.yaml b/ci/environment-3.8.yaml
@@ -6,8 +6,12 @@ dependencies:
   - python=3.8
   - dask
   - distributed
-  - pandas
-  - pyarrow<11
+  # `pandas=2.2` dropped support for `sqlalchemy<2`, but `snowflake-sqlalchemy`
+  # doesn't support `sqlalchemy>=2` yet. Temporarily pinning `pandas<2.2` for now.
+  # xref https://github.com/pandas-dev/pandas/issues/57049
+  # xref https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380
+  - pandas<2.2
+  - pyarrow
   - snowflake-connector-python >=2.6.0
   - snowflake-sqlalchemy
   # Testing

diff --git a/ci/environment-3.9.yaml b/ci/environment-3.9.yaml
@@ -6,8 +6,12 @@ dependencies:
   - python=3.9
   - dask
   - distributed
-  - pandas
-  - pyarrow<11
+  # `pandas=2.2` dropped support for `sqlalchemy<2`, but `snowflake-sqlalchemy`
+  # doesn't support `sqlalchemy>=2` yet. Temporarily pinning `pandas<2.2` for now.
+  # xref https://github.com/pandas-dev/pandas/issues/57049
+  # xref https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380
+  - pandas<2.2
+  - pyarrow
   - snowflake-connector-python >=2.6.0
   - snowflake-sqlalchemy
   # Testing

diff --git a/dask_snowflake/tests/test_core.py b/dask_snowflake/tests/test_core.py
@@ -10,7 +10,7 @@
 import dask
 import dask.dataframe as dd
 import dask.datasets
-from dask.utils import parse_bytes
+from dask.utils import is_dataframe_like, parse_bytes
 from distributed import Client, Lock, worker_client
 
 from dask_snowflake import read_snowflake, to_snowflake
@@ -74,7 +74,7 @@ def test_read_empty_result(table, connection_kwargs, client):
         connection_kwargs=connection_kwargs,
         npartitions=2,
     )
-    assert type(result) is dd.DataFrame
+    assert is_dataframe_like(result)
     assert len(result.index) == 0
     assert len(result.columns) == 0
 

diff --git a/requirements.txt b/requirements.txt
@@ -2,3 +2,8 @@ dask>=2021.05.0
 distributed
 snowflake-connector-python[pandas]>=2.6.0
 snowflake-sqlalchemy
+# `pandas=2.2` dropped support for `sqlalchemy<2`, but `snowflake-sqlalchemy`
+# doesn't support `sqlalchemy>=2` yet. Temporarily pinning `pandas<2.2` for now.
+# xref https://github.com/pandas-dev/pandas/issues/57049
+# xref https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380
+pandas<2.2