fugue 0.9.4__tar.gz → 0.9.6__tar.gz

{fugue-0.9.4 → fugue-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fugue
-Version: 0.9.4
+Version: 0.9.6
 Summary: An abstraction layer for distributed computation
 Home-page: http://github.com/fugue-project/fugue
 Author: The Fugue Development Team
@@ -23,6 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: triad>=1.0.0
 Requires-Dist: adagio>=0.2.6
+Requires-Dist: pandas<3
 Provides-Extra: sql
 Requires-Dist: qpd>=0.4.4; extra == "sql"
 Requires-Dist: fugue-sql-antlr>=0.2.0; extra == "sql"
@@ -32,6 +33,7 @@ Provides-Extra: cpp-sql-parser
 Requires-Dist: fugue-sql-antlr[cpp]>=0.2.0; extra == "cpp-sql-parser"
 Provides-Extra: spark
 Requires-Dist: pyspark>=3.1.1; extra == "spark"
+Requires-Dist: zstandard>=0.25.0; extra == "spark"
 Provides-Extra: dask
 Requires-Dist: dask[dataframe,distributed]>=2024.4.0; extra == "dask"
 Requires-Dist: pyarrow>=7.0.0; extra == "dask"

{fugue-0.9.4 → fugue-0.9.6}/fugue.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fugue
-Version: 0.9.4
+Version: 0.9.6
 Summary: An abstraction layer for distributed computation
 Home-page: http://github.com/fugue-project/fugue
 Author: The Fugue Development Team
@@ -23,6 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: triad>=1.0.0
 Requires-Dist: adagio>=0.2.6
+Requires-Dist: pandas<3
 Provides-Extra: sql
 Requires-Dist: qpd>=0.4.4; extra == "sql"
 Requires-Dist: fugue-sql-antlr>=0.2.0; extra == "sql"
@@ -32,6 +33,7 @@ Provides-Extra: cpp-sql-parser
 Requires-Dist: fugue-sql-antlr[cpp]>=0.2.0; extra == "cpp-sql-parser"
 Provides-Extra: spark
 Requires-Dist: pyspark>=3.1.1; extra == "spark"
+Requires-Dist: zstandard>=0.25.0; extra == "spark"
 Provides-Extra: dask
 Requires-Dist: dask[dataframe,distributed]>=2024.4.0; extra == "dask"
 Requires-Dist: pyarrow>=7.0.0; extra == "dask"

{fugue-0.9.4 → fugue-0.9.6}/fugue.egg-info/requires.txt

@@ -1,5 +1,6 @@
 triad>=1.0.0
 adagio>=0.2.6
+pandas<3
 
 [all]
 qpd>=0.4.4
@@ -58,6 +59,7 @@ pandas
 
 [spark]
 pyspark>=3.1.1
+zstandard>=0.25.0
 
 [sql]
 qpd>=0.4.4

{fugue-0.9.4 → fugue-0.9.6}/fugue_spark/_utils/misc.py

@@ -1,15 +1,25 @@
+import pyspark.sql as ps
+import pyspark
 from typing import Any
 
+
+SPARK_VERSION = pyspark.__version__.split(".")
+
 try:
-    from pyspark.sql.connect.session import SparkSession as SparkConnectSession
-    from pyspark.sql.connect.dataframe import DataFrame as SparkConnectDataFrame
+    if int(SPARK_VERSION[0]) >= 4:
+        from pyspark.sql import SparkSession as SparkConnectSession
+        from pyspark.sql import DataFrame as SparkConnectDataFrame
+    else:  # pragma: no cover
+        from pyspark.sql.connect.session import SparkSession as SparkConnectSession
+        from pyspark.sql.connect.dataframe import DataFrame as SparkConnectDataFrame
 except Exception:  # pragma: no cover
     SparkConnectSession = None
     SparkConnectDataFrame = None
-import pyspark.sql as ps
 
 
-def is_spark_connect(session: Any) -> bool:
+def is_spark_connect(session: Any) -> bool:  # pragma: no cover
+    if int(SPARK_VERSION[0]) >= 4:
+        return False
     return SparkConnectSession is not None and isinstance(
         session, (SparkConnectSession, SparkConnectDataFrame)
     )

fugue-0.9.6/fugue_version/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.9.6"

{fugue-0.9.4 → fugue-0.9.6}/setup.py

@@ -40,11 +40,12 @@ setup(
     install_requires=[
         "triad>=1.0.0",
         "adagio>=0.2.6",
+        "pandas<3",  # TODO: remove upper bound on 0.9.7
     ],
     extras_require={
         "sql": SQL_DEPENDENCIES,
         "cpp_sql_parser": ["fugue-sql-antlr[cpp]>=0.2.0"],
-        "spark": ["pyspark>=3.1.1"],
+        "spark": ["pyspark>=3.1.1", "zstandard>=0.25.0"],
         "dask": [
             "dask[distributed,dataframe]>=2024.4.0",
             "pyarrow>=7.0.0",

fugue-0.9.4/fugue_version/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.9.4"