fugue 0.9.5__py3-none-any.whl → 0.9.7.dev0__py3-none-any.whl

fugue/__init__.py

@@ -1,4 +1,8 @@
 # flake8: noqa
+from importlib.metadata import version
+
+__version__ = version("fugue")
+
 from triad.collections import Schema
 
 from fugue.api import out_transform, transform
@@ -83,7 +87,6 @@ from fugue.sql.workflow import FugueSQLWorkflow
 from fugue.workflow._workflow_context import FugueWorkflowContext
 from fugue.workflow.module import module
 from fugue.workflow.workflow import FugueWorkflow, WorkflowDataFrame, WorkflowDataFrames
-from fugue_version import __version__
 
 from .dev import *
 

fugue/dataframe/dataframe.py

@@ -59,9 +59,7 @@ class DataFrame(Dataset):
             assert isinstance(self._schema, Schema)
             return self._schema  # type: ignore
         with self._lazy_schema_lock:
-            self._schema = _input_schema(
-                self._schema()
-            ).assert_not_empty()  # type: ignore
+            self._schema = _input_schema(self._schema()).assert_not_empty()  # type: ignore
             self._schema.set_readonly()
             self._schema_discovered = True
             return self._schema

fugue/dataframe/function_wrapper.py

@@ -1,4 +1,5 @@
 import inspect
+from collections.abc import Callable as AbcCallable
 from typing import (
     Any,
     Callable,
@@ -7,6 +8,9 @@ from typing import (
     Iterator,
     List,
     Optional,
+    Union,
+    get_args,
+    get_origin,
     no_type_check,
 )
 
@@ -39,13 +43,66 @@ from .pandas_dataframe import PandasDataFrame
 
 
 def _compare_iter(tp: Any) -> Any:
-    return lambda x: compare_annotations(
-        x, Iterable[tp]  # type:ignore
-    ) or compare_annotations(
-        x, Iterator[tp]  # type:ignore
+    return lambda x: (
+        compare_annotations(
+            x,
+            Iterable[tp],  # type:ignore
+        )
+        or compare_annotations(
+            x,
+            Iterator[tp],  # type:ignore
+        )
     )
 
 
+def _is_optional(annotation) -> bool:
+    origin = get_origin(annotation)
+
+    # Check if it's a Union type
+    if origin is Union:
+        args = get_args(annotation)
+        # Optional[T] is Union[T, None]
+        return type(None) in args
+
+
+def _is_required_callable(annotation) -> bool:
+    """Check if annotation is a required (non-optional) Callable type."""
+    if _is_optional(annotation):
+        return False
+
+    # Check direct equality
+    if annotation == Callable or annotation == callable:  # pylint: disable=comparison-with-callable
+        return True
+
+    # Check if it's a generic Callable like Callable[[int], str]
+    origin = get_origin(annotation)
+    return origin is AbcCallable or origin is type(Callable)
+
+
+def _is_optional_callable(annotation) -> bool:
+    """Check if annotation is an optional Callable type (Optional[Callable] or Callable | None)."""
+    if not _is_optional(annotation):
+        return False
+
+    # Get the non-None types from the Union
+    args = get_args(annotation)
+    non_none_types = [arg for arg in args if arg is not type(None)]
+
+    # Should have exactly one non-None type, and it should be Callable
+    if len(non_none_types) != 1:  # pragma: no cover
+        return False
+
+    inner_type = non_none_types[0]
+
+    # Check if the inner type is Callable
+    if inner_type == Callable or inner_type == callable:  # pylint: disable=comparison-with-callable
+        return True
+
+    # Check if it's a generic Callable like Callable[[int], str]
+    origin = get_origin(inner_type)
+    return origin is AbcCallable or origin is type(Callable)
+
+
 @function_wrapper(FUGUE_ENTRYPOINT)
 class DataFrameFunctionWrapper(FunctionWrapper):
     @property
@@ -154,12 +211,7 @@ fugue_annotated_param = DataFrameFunctionWrapper.annotated_param
 @fugue_annotated_param(
     "Callable",
     "F",
-    lambda annotation: (
-        annotation == Callable
-        or annotation == callable  # pylint: disable=comparison-with-callable
-        or str(annotation).startswith("typing.Callable")
-        or str(annotation).startswith("collections.abc.Callable")
-    ),
+    _is_required_callable,
 )
 class _CallableParam(AnnotatedParam):
     pass
@@ -168,15 +220,7 @@ class _CallableParam(AnnotatedParam):
 @fugue_annotated_param(
     "Callable",
     "f",
-    lambda annotation: (
-        annotation == Optional[Callable]
-        or annotation == Optional[callable]
-        or str(annotation).startswith("typing.Union[typing.Callable")  # 3.8-
-        or str(annotation).startswith("typing.Optional[typing.Callable")  # 3.9+
-        or str(annotation).startswith(
-            "typing.Optional[collections.abc.Callable]"
-        )  # 3.9+
-    ),
+    _is_optional_callable,
 )
 class _OptionalCallableParam(AnnotatedParam):
     pass

fugue/dataframe/utils.py

@@ -61,9 +61,9 @@ def _df_eq(
     else:
         df2 = as_fugue_df(data).as_local_bounded()
     try:
-        assert (
-            df1.count() == df2.count()
-        ), f"count mismatch {df1.count()}, {df2.count()}"
+        assert df1.count() == df2.count(), (
+            f"count mismatch {df1.count()}, {df2.count()}"
+        )
         assert not check_schema or df.schema.is_like(
             df2.schema, equal_groups=equal_type_groups
         ), f"schema mismatch {df.schema.pa_schema}, {df2.schema.pa_schema}"

fugue/extensions/_builtins/outputters.py

@@ -67,7 +67,7 @@ class Save(Outputter):
             mode=mode,
             partition_spec=partition_spec,
             force_single=force_single,
-            **kwargs
+            **kwargs,
         )
 
 

fugue/extensions/_builtins/processors.py

@@ -314,7 +314,7 @@ class SaveAndUse(Processor):
             mode=mode,
             partition_spec=partition_spec,
             force_single=force_single,
-            **kwargs
+            **kwargs,
         )
         return self.execution_engine.load_df(path=path, format_hint=format_hint)
 

fugue/extensions/processor/convert.py

@@ -136,6 +136,7 @@ def processor(
     Please read
     :doc:`Processor Tutorial <tutorial:tutorials/extensions/processor>`
     """
+
     # TODO: validation of schema if without * should be done at compile time
     def deco(func: Callable) -> "_FuncAsProcessor":
         return _FuncAsProcessor.from_func(

fugue/extensions/transformer/convert.py

@@ -546,7 +546,10 @@ class _FuncAsOutputCoTransformer(_FuncAsCoTransformer):
             p = dict(dfs)
             p.update(self.params)
             self._wrapper.run(
-                [] + cb, p, ignore_unknown=False, output=False  # type: ignore
+                [] + cb,
+                p,
+                ignore_unknown=False,
+                output=False,  # type: ignore
             )
         return ArrayDataFrame([], OUTPUT_TRANSFORMER_DUMMY_SCHEMA)
 

fugue/sql/_utils.py

@@ -35,7 +35,6 @@ def fill_sql_template(sql: str, params: Dict[str, Any]):
         template = Template(new_sql)
 
     except jinja2.exceptions.TemplateSyntaxError:
-
         template = Template(sql)
 
     return template.render(**params)

fugue/sql/_visitors.py

@@ -820,7 +820,6 @@ class _Extensions(_VisitorBase):
 
     def visitSetOperation(self, ctx: fp.SetOperationContext) -> Iterable[Any]:
         def get_sub(_ctx: Tree) -> List[Any]:
-
             sub = list(
                 self.visitFugueTerm(_ctx)
                 if isinstance(_ctx, fp.FugueTermContext)

fugue/workflow/_tasks.py

@@ -204,7 +204,9 @@ class FugueTask(TaskSpec, ABC):
 
             # add caller traceback
             ctb = modify_traceback(
-                sys.exc_info()[2].tb_next, None, self._traceback  # type: ignore
+                sys.exc_info()[2].tb_next,
+                None,
+                self._traceback,  # type: ignore
             )
             if ctb is None:  # pragma: no cover
                 raise

fugue/workflow/workflow.py

@@ -1468,7 +1468,8 @@ class WorkflowDataFrames(DataFrames):
         super().__setitem__(key, value, *args, **kwds)
 
     def __getitem__(  # pylint: disable=W0235
-        self, key: Union[str, int]  # type: ignore
+        self,
+        key: Union[str, int],  # type: ignore
     ) -> WorkflowDataFrame:
         return super().__getitem__(key)  # type: ignore
 
@@ -1791,8 +1792,7 @@ class FugueWorkflow:
                 )
             )
         raise FugueWorkflowCompileError(
-            f"Input data of type {type(data)} can't "
-            "be converted to WorkflowDataFrame"
+            f"Input data of type {type(data)} can't be converted to WorkflowDataFrame"
         )
 
     def df(

{fugue-0.9.5.dist-info → fugue-0.9.7.dev0.dist-info}/METADATA

@@ -1,27 +1,26 @@
 Metadata-Version: 2.4
 Name: fugue
-Version: 0.9.5
+Version: 0.9.7.dev0
 Summary: An abstraction layer for distributed computation
-Home-page: http://github.com/fugue-project/fugue
-Author: The Fugue Development Team
-Author-email: hello@fugue.ai
+Author-email: The Fugue Development Team <hello@fugue.ai>
 License: Apache-2.0
-Keywords: distributed spark dask ray sql dsl domain specific language
+Project-URL: Homepage, http://github.com/fugue-project/fugue
+Project-URL: Repository, http://github.com/fugue-project/fugue
+Keywords: distributed,spark,dask,ray,sql,dsl,domain specific language
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: triad>=1.0.0
+Requires-Dist: triad>=1.0.1
 Requires-Dist: adagio>=0.2.6
 Requires-Dist: pandas<3
 Provides-Extra: sql
@@ -39,7 +38,7 @@ Requires-Dist: dask[dataframe,distributed]>=2024.4.0; extra == "dask"
 Requires-Dist: pyarrow>=7.0.0; extra == "dask"
 Requires-Dist: pandas>=2.0.2; extra == "dask"
 Provides-Extra: ray
-Requires-Dist: ray[data]>=2.30.0; extra == "ray"
+Requires-Dist: ray[data]>=2.30.0; python_version < "3.14" and extra == "ray"
 Requires-Dist: duckdb>=0.5.0; extra == "ray"
 Requires-Dist: pyarrow>=7.0.0; extra == "ray"
 Requires-Dist: pandas; extra == "ray"
@@ -70,7 +69,7 @@ Requires-Dist: jinja2; extra == "all"
 Requires-Dist: pyspark>=3.1.1; extra == "all"
 Requires-Dist: dask[dataframe,distributed]>=2024.4.0; extra == "all"
 Requires-Dist: dask-sql; extra == "all"
-Requires-Dist: ray[data]>=2.30.0; extra == "all"
+Requires-Dist: ray[data]>=2.30.0; python_version < "3.14" and extra == "all"
 Requires-Dist: notebook; extra == "all"
 Requires-Dist: jupyterlab; extra == "all"
 Requires-Dist: ipython>=7.10.0; extra == "all"
@@ -79,26 +78,14 @@ Requires-Dist: pyarrow>=6.0.1; extra == "all"
 Requires-Dist: pandas>=2.0.2; extra == "all"
 Requires-Dist: ibis-framework[duckdb,pandas]; extra == "all"
 Requires-Dist: polars; extra == "all"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
-# Fugue
+# <img src="./images/logo.svg" width="200">
 
 [![PyPI version](https://badge.fury.io/py/fugue.svg)](https://pypi.python.org/pypi/fugue/)
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/fugue.svg)](https://pypi.python.org/pypi/fugue/)
 [![PyPI license](https://img.shields.io/pypi/l/fugue.svg)](https://pypi.python.org/pypi/fugue/)
-[![codecov](https://codecov.io/gh/fugue-project/fugue/branch/master/graph/badge.svg?token=ZO9YD5N3IA)](https://codecov.io/gh/fugue-project/fugue)
+[![codecov](https://codecov.io/gh/fugue-project/fugue/branch/main/graph/badge.svg?token=ZO9YD5N3IA)](https://codecov.io/gh/fugue-project/fugue)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4fa5f2f53e6f48aaa1218a89f4808b91)](https://www.codacy.com/gh/fugue-project/fugue/dashboard?utm_source=github.com&utm_medium=referral&utm_content=fugue-project/fugue&utm_campaign=Badge_Grade)
 [![Downloads](https://static.pepy.tech/badge/fugue)](https://pepy.tech/project/fugue)
 

{fugue-0.9.5.dist-info → fugue-0.9.7.dev0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fugue/__init__.py,sha256=LKkBEPEAMLG-Yuzqt0IgoIDEfNf9a1zUffNKb83D_l8,2705
+fugue/__init__.py,sha256=asKV-hQ4hXj28c8zwjZQHj_JlomElOTRRaO8tx29sYw,2739
 fugue/api.py,sha256=dLUrigFhDMB5x7cvlWSK8EyaY2o0AmhgPr0VRtfzSz0,1254
 fugue/constants.py,sha256=crd0VqX8WtBcjSUNwZDi2LDIEkhUMWOlSn73H8JI9ds,3385
 fugue/dev.py,sha256=GQCkezBBl4V0lVDWhGtUQKqomiCxgR9dMhfqj9C8cS8,1369
@@ -28,13 +28,13 @@ fugue/dataframe/__init__.py,sha256=zm7TbsaJLIvfm7zymWm2LGcuJd3nxfGsFnQiyrSnenM,6
 fugue/dataframe/api.py,sha256=aWBvMaiSUxOvdQMfe79zHShWuPfLcgiWggC9HvVxvSE,11017
 fugue/dataframe/array_dataframe.py,sha256=4scWnmQ6sjy1A6o7IYdRc0VVutBEfcJrA1f9wkph4Kg,4440
 fugue/dataframe/arrow_dataframe.py,sha256=r5zcZBX_N6XO5dmixBkTCPgLcMmgDF022piZvrwRp_c,11485
-fugue/dataframe/dataframe.py,sha256=xmyG85i14A6LDRkNmPt29oYq7PJsq668s1QvFHK8PV4,16964
+fugue/dataframe/dataframe.py,sha256=B9-oKUWMNXvKjAEchwJt9gzDbeIYMFWsLdt_YmJUCQg,16934
 fugue/dataframe/dataframe_iterable_dataframe.py,sha256=lx71KfaI4lsVKI-79buc-idaeT20JEMBOq21SQcAiY8,7259
 fugue/dataframe/dataframes.py,sha256=tBSpHsENgbcdOJ0Jgst6PTKbjG7_uoFJch96oTlaQIs,4160
-fugue/dataframe/function_wrapper.py,sha256=7Sb6XrWTD_swtHJbHDWZRxHvFNWkERynnCDzLM0wSbo,18340
+fugue/dataframe/function_wrapper.py,sha256=HbilDPKVuRMvOBqMB_083xQf7rVw4Gx_hxzmHOLREbY,19495
 fugue/dataframe/iterable_dataframe.py,sha256=TcOoNKa4jNbHbvAZ0XAhtMmGcioygIHPxI9budDtenQ,4758
 fugue/dataframe/pandas_dataframe.py,sha256=0L0wYCGhD2BpQbruoT07Ox9iQM5YLHLNrcgzudc-yKs,11633
-fugue/dataframe/utils.py,sha256=bA_otOJt9oju1yq5gtn21L_GDT_pUgNc6luYuBIhbUQ,10488
+fugue/dataframe/utils.py,sha256=LXauFKUiydr2Y_cLE6zdPwXUyw78Gm1cJCzdmEXERrI,10488
 fugue/dataset/__init__.py,sha256=5f2CAJ4xst6Z2o9Q2e2twfDOGUw8ZJoE2ild4JEU2pg,112
 fugue/dataset/api.py,sha256=DacI4L2w5NJ-eZ6nFxNMqmReEnb0WUXswbjVp7BeErk,2794
 fugue/dataset/dataset.py,sha256=jWXZqy3msMPFFkhas2PYJEX55ZAI3gk3Txq5f4-Qya4,4759
@@ -48,8 +48,8 @@ fugue/extensions/_utils.py,sha256=Bi3pYKy2Z6fG6_5BpwIWldxetassXpB4Zp8QamWB-wg,51
 fugue/extensions/context.py,sha256=c_y2UttzzIFoQTOCV42VCdj2nqah33xYuBjbKNIOpx8,4262
 fugue/extensions/_builtins/__init__.py,sha256=OAUjZJP-QI8VpJxxEEZJFFGir4PmTyLMmWQ3VCHtIGk,545
 fugue/extensions/_builtins/creators.py,sha256=ad9snV4oN7F9o50Iaa9T4tw5J6rXBUgOHOINKzDqoEQ,1825
-fugue/extensions/_builtins/outputters.py,sha256=vMkzarf39bBk37efVa1nQ2qFaFauejsOEG6c_0fC9kE,6939
-fugue/extensions/_builtins/processors.py,sha256=JuwIhyvGiO_kZ_xU8SCCy5Zk0wOXfC_pSrxraM24izU,14545
+fugue/extensions/_builtins/outputters.py,sha256=n_9cqv6JGQNKw_5j_4kXo5xcMnt6Hz5YB4t1wfsvU5A,6940
+fugue/extensions/_builtins/processors.py,sha256=4L_AicO6XBbH2Sif1-Z0BGunCN4OFSIIzSyGSuqjHgQ,14546
 fugue/extensions/creator/__init__.py,sha256=7qmrb0eRKbGSEvrb6045-5hkmjH-nT1GJo1qYubX158,188
 fugue/extensions/creator/convert.py,sha256=66ei5x0K0a8nWQ-kNwZXmmf1VeR_6XuqSe9rZ64mYpI,7297
 fugue/extensions/creator/creator.py,sha256=ET9yprY4mvw0kkfWtW4aQEvKv1VR-FiWT4SThvwgAyo,1541
@@ -57,18 +57,18 @@ fugue/extensions/outputter/__init__.py,sha256=j7jHSOB2xfnJlg9BdL9UHwAML4A77eI6kI
 fugue/extensions/outputter/convert.py,sha256=dPyNELy6Sruv5_NJlMSPPIfBknTlRVZo0zCWAz5U16o,6939
 fugue/extensions/outputter/outputter.py,sha256=n2Do4NKX7_uKkUQRrSjJAl6CYoifb9_zEaXTZIF_ZJQ,1619
 fugue/extensions/processor/__init__.py,sha256=8ws8WSnLGCfTdsigoU0_xpaPY54vpo0V2O3Bw3W9cSg,204
-fugue/extensions/processor/convert.py,sha256=zG0lMtHGwY5TsqK4eplbMdlTg7J_PD3HbI0jdWcv5yw,8302
+fugue/extensions/processor/convert.py,sha256=dtknMhHeAoXEeNIMZ0m-ySJofdb5JKL2eHY-pgBWOVQ,8303
 fugue/extensions/processor/processor.py,sha256=czhQlQgMpAXXoLVAX9Q0TFUMYEEhsgufTammxcKSmOY,1665
 fugue/extensions/transformer/__init__.py,sha256=VD6d-8xW1Yl8fUPj43cBWNR9pCOlYD9xWyGIHAlHwvI,456
 fugue/extensions/transformer/constants.py,sha256=76DfpoTOGQ8gp5XtCs_xznfbr_H015-prXpHWSqMNDU,59
-fugue/extensions/transformer/convert.py,sha256=zDDIpZawMnHFarjZNZAyiw1jfyXGuPjnvgQk9jpYLak,23384
+fugue/extensions/transformer/convert.py,sha256=QRAp1S2rm8uDJt69Wm7yzszJyD83IzFZEURrNCNOMuQ,23433
 fugue/extensions/transformer/transformer.py,sha256=zhOUgyv5-DPxYd1CP_98WeEw-zUgwknRnPW_6di-q3g,9098
 fugue/rpc/__init__.py,sha256=3GzUl4QZQuCChjD7eaTJW8tnTwfke6ZY9r9g5nCeBZ8,167
 fugue/rpc/base.py,sha256=3Fq5SvwLZqw9NXru3r32WuJKBGFr9bl7nFgy6e9boGo,8470
 fugue/rpc/flask.py,sha256=VzJEND8Pqatf6pYYT9LDXeO1JDMmYAOY0lm8XUncKbA,4807
 fugue/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fugue/sql/_utils.py,sha256=khpjGeFCVlaqf2JIYvS4TVTJO3fe5-8bEsvy6AIP_5Q,2083
-fugue/sql/_visitors.py,sha256=2pc0J-AHJAiIexsKgNjcgrCGOyhC3_7rzonSgtjy--k,33844
+fugue/sql/_utils.py,sha256=IOXhwDNnjtQI2uxhSjnEzMIFpe3k6B3T1RikPRYdf-M,2082
+fugue/sql/_visitors.py,sha256=5m8msl86T1SYW5EyeX_NLVLTPUE_pCdRKt-dgMV1bYI,33843
 fugue/sql/api.py,sha256=l2I9CAy_W2oFFTct9fDPLyXF0LiDxQhMx5O8jBHTAxU,10050
 fugue/sql/workflow.py,sha256=S1pOhp0b0t6johFAJWmj6xUB7Ti5LQgNABpAzmLGjrQ,3010
 fugue/test/__init__.py,sha256=hvVrNbJYkWI_6otpILneyTjUafxURaA4obK6AoDyCUw,250
@@ -76,23 +76,23 @@ fugue/test/pandas_tester.py,sha256=_w6rFqlzZKjBtmFf-08a4C97W5xtqGw5XorLhj6Zyoo,6
 fugue/test/plugins.py,sha256=GLZia5GCmy0eBVGNbIqTbX7Ou3euf2SY4litKgdigwY,12318
 fugue/workflow/__init__.py,sha256=tXM_KYO8Q358W6qAVlwhIQIaYNRDgZtTubrIEX4QMgM,229
 fugue/workflow/_checkpoint.py,sha256=tt5Iv7c5ZStC0MD1inItksQ0GuK0ViniA3nvrgym-5c,5681
-fugue/workflow/_tasks.py,sha256=Zq_jXJO_VaF8DrWUuBiwO2Y3OVuhsiOQdzP4VBsp7Fo,11826
+fugue/workflow/_tasks.py,sha256=Qezr3Gb-I2WifTjE2vC_YiAaXx6IDZKT3ka3NHqI2tU,11859
 fugue/workflow/_workflow_context.py,sha256=Wmp6n0lSrh2Gpslb5EaSX6BQNniKsvKn6SlhVkQ6ui0,2504
 fugue/workflow/api.py,sha256=uQoxPSCZ91-ST4vwuPWG7qioRGW4eo-Sgi3DdwtSL4k,12495
 fugue/workflow/input.py,sha256=V_zLDNzndmQuYJAPXtdK4n-vOp7LrimGIf_wQtwf2mc,321
 fugue/workflow/module.py,sha256=ajyqgMwX6hFMZY9xp4Bp1Q-Zdta0p5f_W_n_SNrc4LE,5547
-fugue/workflow/workflow.py,sha256=-SFCXkyxgXbS6DpQGSBox4d3Ws3psIlB6PnraJLSu9Y,88219
-fugue-0.9.5.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+fugue/workflow/workflow.py,sha256=laQXwUEhrmCxYWVownMgjLLbcmc7BiNb2ajZfQ4FgZU,88213
+fugue-0.9.7.dev0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
 fugue_contrib/__init__.py,sha256=QJioX-r2AiU7Pvt24M-k2c4vNq29qpK-3WNUde7ucck,222
 fugue_contrib/contrib.py,sha256=3B--6oIVBMZ-GwjIOXwZqYqkloH7Cxfq1I8vkwl2yPk,267
 fugue_contrib/seaborn/__init__.py,sha256=NuVv8EI4Om4gHcHwYO8ddextLQqw24vDj8qJio3E1MU,1405
 fugue_contrib/viz/__init__.py,sha256=osgZx63Br-yMZImyEfYf9MVzJNM2Cqqke_-WsuDmG5M,1273
 fugue_contrib/viz/_ext.py,sha256=Lu_DlS5DcmrFz27fHcKTCkhKyknVWcfS5kzZVVuO9xM,1345
-fugue_dask/__init__.py,sha256=2CcJ0AsN-k_f7dZ-yAyYpaICfUMPfH3l0FvUJSBzTr0,161
+fugue_dask/__init__.py,sha256=OPgP3PUI1-RrAw9oNevlFI7c7friM5JcTVRgm74iFhA,194
 fugue_dask/_constants.py,sha256=35UmTVITk21GhRyRlbJOwPPdQsytM_p_2NytOXEay18,510
 fugue_dask/_dask_sql_wrapper.py,sha256=lj38gJIOdoMV9W44gpwzLjUEtPVsQNKjRWuEkfI7-PM,2618
 fugue_dask/_io.py,sha256=pl4F7mbVgP7Rwh1FFG7xfOz2TBZRUj1l3lLvDY4jOf4,6020
-fugue_dask/_utils.py,sha256=0R0pCh4B47kQsAS_o0QGaosIqVcZnSakm6pfMB7fSXs,9059
+fugue_dask/_utils.py,sha256=Z15myyjGbYpdHWZLmabuwi1SG40RNwfTmgjRWREHBLI,8864
 fugue_dask/dataframe.py,sha256=4Dvckpc4mlld2WsEFTTemxoA1zYK8Cn6jMKxUxYQCEE,13491
 fugue_dask/execution_engine.py,sha256=mFN_IurhdBEu8C5OreqpGSRdTbTBqSpzJO2dMQzEF-o,21264
 fugue_dask/registry.py,sha256=jepWKH55VWNIWV3pOF5vpCl2OpO0rI1IULx5GM2Gk6w,2274
@@ -102,15 +102,15 @@ fugue_duckdb/_io.py,sha256=vnd8m8C6XeMCBJBbAdA5h695NMfsduQrvONyS0HcEFA,8475
 fugue_duckdb/_utils.py,sha256=ElKbHUyn5fWSPGXsK57iqMzcqKtCf0c8pBVBYGe5Ql4,5020
 fugue_duckdb/dask.py,sha256=agoLzeB7Swxj2kVWfmXFbWD1NS2lbbTlnrjSkR8kKWY,5014
 fugue_duckdb/dataframe.py,sha256=LAPoPOad9hgGhjyhlMGMfrnhkyBKe06Xzn6eP1hkl-w,8504
-fugue_duckdb/execution_engine.py,sha256=3f5hbWcX1y9mAtfFixrri-snYxVIQAf4HOgo9fHbDwQ,20385
+fugue_duckdb/execution_engine.py,sha256=-nuRZQ64SPCWehY54hX9h30jz_8UWQpvXBRKFqD6pwI,20453
 fugue_duckdb/registry.py,sha256=9_41KO42kXqcjF4yParQ5JGyg5TckcbhH-Q2IlGpSho,3987
 fugue_duckdb/tester.py,sha256=MzTkv3sdOwOjI59LRrSGGl4w59Njv3OArTU5kSRL-P0,1526
 fugue_ibis/__init__.py,sha256=z7TkK7M2_0p9XO6jQATNDgT0aHXn5k69Ttz2ga-eQG8,190
 fugue_ibis/_compat.py,sha256=zKdTaTfuC02eUIzZPkcd7oObnVBi_X5mQjQf7SDme3Y,246
-fugue_ibis/_utils.py,sha256=BUL5swA5FE4eQu0t5Z17hZVu9a2MFfxlFH6Ymy9xifg,6607
+fugue_ibis/_utils.py,sha256=3e_ir6eigJO99_YJRHzRElsM-YXciUi15MhfBCDZ3sU,6609
 fugue_ibis/dataframe.py,sha256=k4Q6qBLBIADF5YhbvaDplXO7OkMZSHuf_Wg5o-AusEI,7796
 fugue_ibis/execution_engine.py,sha256=jRnp1m1wuTicS29A-WA043f8QwdoK8b9rwPXvTkm8r8,18751
-fugue_notebook/__init__.py,sha256=9r_-2uxu1lBeZ8GgpYCKom_OZy2soIOYZajg7JDO-HY,4326
+fugue_notebook/__init__.py,sha256=4VQQJweSb7ZKAtMtPsoyBPDO5K2MrS4xyHyR5d8pWbc,4358
 fugue_notebook/env.py,sha256=TYiTxYPFi-BVJJY49jDsvw9mddhK8WrifeRxBke30I8,4773
 fugue_notebook/nbextension/README.md,sha256=QLnr957YeGfwzy2r4c4qbZPaXyCbyGrKPvcqSBQYSnU,123
 fugue_notebook/nbextension/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -129,29 +129,28 @@ fugue_ray/tester.py,sha256=oTA_xOzvQhJU3ohc4hsVpZc0zv4bwJn1c8a9u8kcuIs,537
 fugue_ray/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fugue_ray/_utils/cluster.py,sha256=3T3Gyra6lAHlzktta-Ro35j6YZQfH6fNrj2hC5ATF9k,621
 fugue_ray/_utils/dataframe.py,sha256=5c4duGV--mdLkKrbJRgjDWvVcp9BegA3yX16pmYDYLE,3954
-fugue_ray/_utils/io.py,sha256=JZdL7pdpk1DUIj77NJSzU_EZOW4cN7oNjwGy2w-LRTw,10142
-fugue_spark/__init__.py,sha256=rvrMpFs9socMgyH_58gLbnAqmirBf5oidXoO4cekW6U,165
+fugue_ray/_utils/io.py,sha256=jt4A4bQXCbNGvuJblL41TjZO9wscIJcwMlp2VfrbXx8,10155
+fugue_spark/__init__.py,sha256=mFhe1g4wdr6LeTkXJGe7G2yZ2mympB8hbSkWye9L9sA,198
 fugue_spark/_constants.py,sha256=K2uLQfjvMxXk75K-7_Wn47Alpwq5rW57BtECAUrOeqA,177
-fugue_spark/dataframe.py,sha256=lYa8FizM3p_lsKYFR49FazkVZMJKyi2LABKTpP5YBLo,12006
+fugue_spark/dataframe.py,sha256=_gLP9rLVVCb5ILccvYMFDpCAdTAzedecqHKYGZEX0DE,11984
 fugue_spark/execution_engine.py,sha256=YBMtNxCvpy77xICFSg9PHMa6feNoYhWEZe8MmxznX4U,33048
 fugue_spark/registry.py,sha256=_NmiV2cOooYK0YmqATEnNkPEMT9suUMtuecw2NNbIIk,4530
 fugue_spark/tester.py,sha256=VX003yGNlBukaZTQSN-w7XvgSk4rqxrWQIzno0dWrXg,2481
 fugue_spark/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fugue_spark/_utils/convert.py,sha256=J3HtbuzomTYTN6A11iuvsC1h2C7o3fQBW5U360xGDhE,10234
+fugue_spark/_utils/convert.py,sha256=c5YaJ6kfXd0DnFGqjlR8WGG5TyNKMPVaV2HzdfY-ix0,10201
 fugue_spark/_utils/io.py,sha256=OdUezKpB29Lx9aUS2k9x0xUAGZrmgMZyQYGPEeHk7rQ,5574
-fugue_spark/_utils/misc.py,sha256=yLZVsz09gxGxfUkAGdqWAtmjSWiF5IInQtlN8z7c8hY,1228
+fugue_spark/_utils/misc.py,sha256=lUo19PPwcYGSYj3L10stqf8eRW7lnwPoJ9Q3kUwvwY0,1206
 fugue_spark/_utils/partition.py,sha256=iaesyO5f4uXhj1W-p91cD5ecPiGlu0bzh8gl2ce2Uvg,3618
-fugue_sql/__init__.py,sha256=Cmr7w0Efr7PzoXdQzdJfc4Dgqd69qKqcHZZodENq7EU,287
+fugue_sql/__init__.py,sha256=pzg-LiHE8n6j0vWysB3Gw_fyx5fHEw7Joja6T137Rrs,320
 fugue_sql/exceptions.py,sha256=ltS0MC8gMnVVrJbQiOZ0kRUWvVQ2LTx33dCW3ugqtb0,260
 fugue_test/__init__.py,sha256=xoQuVobhU64uyODRdnzf6MSWe9lw5khkhpJ2atvADoc,2315
 fugue_test/bag_suite.py,sha256=WbDCFjuAHYoJh4GXSPiSJxOoOwE1VMtYpJ3lQrsUK-Y,2483
-fugue_test/builtin_suite.py,sha256=jP3xiq2vRZNNGzoSRjcUfrUk8NVg31SU0kpJaEvP25E,79400
+fugue_test/builtin_suite.py,sha256=n79zKh__qdtF67zBi3TCBoY5NC52JIzCWtlFPUkgsHc,79376
 fugue_test/dataframe_suite.py,sha256=7ym4sshDUly6004cq1UlppqDVtbwxD6CKxR4Lu70i0s,18994
 fugue_test/execution_suite.py,sha256=wUiGdb8wLRd13JXo7Lo19vPOLh7t1C-L2NPLeU0k-uE,48736
 fugue_test/fixtures.py,sha256=8Pev-mxRZOWwTFlsGjcSZ0iIs78zyWbp5tq4KG1wyvk,1432
-fugue_version/__init__.py,sha256=ORAtCCI2THBDcdzIbh6oBsoshDvkkmXUWpmO4Q5McAk,22
-fugue-0.9.5.dist-info/METADATA,sha256=zWWQ_tI_bPidg9zi3s4BL4FfC2OD45Qm-PuVERmTGrA,18593
-fugue-0.9.5.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fugue-0.9.5.dist-info/entry_points.txt,sha256=2Vxp1qew_tswacA8m0RzIliLlFOQMlzezvSXPugM_KA,295
-fugue-0.9.5.dist-info/top_level.txt,sha256=y1eCfzGdQ1_RkgcShcfbvXs-bopD3DwJcIOxP9EFXno,140
-fugue-0.9.5.dist-info/RECORD,,
+fugue-0.9.7.dev0.dist-info/METADATA,sha256=OwSSeQA85bd68u6E1S2mV-nP1REAWoZH8QTEg0i__Bo,18441
+fugue-0.9.7.dev0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+fugue-0.9.7.dev0.dist-info/entry_points.txt,sha256=nlvV6bg8ZNdUE8WJrgHWkNBMiRnPaTWQA8Y7xfqSQVA,255
+fugue-0.9.7.dev0.dist-info/top_level.txt,sha256=OCVNEONKPoAH4r8hUUSnvRHtZVnDu38FH44y3CRxtB8,126
+fugue-0.9.7.dev0.dist-info/RECORD,,

{fugue-0.9.5.dist-info → fugue-0.9.7.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

fugue-0.9.7.dev0.dist-info/entry_points.txt

@@ -0,0 +1,11 @@
+[fugue.plugins]
+dask = fugue_dask.registry
+duckdb = fugue_duckdb.registry
+ibis = fugue_ibis
+polars = fugue_polars.registry
+ray = fugue_ray.registry
+spark = fugue_spark.registry
+
+[pytest11]
+fugue_test = fugue_test
+fugue_test_fixtures = fugue_test.fixtures

{fugue-0.9.5.dist-info → fugue-0.9.7.dev0.dist-info}/top_level.txt

@@ -9,4 +9,3 @@ fugue_ray
 fugue_spark
 fugue_sql
 fugue_test
-fugue_version

fugue_dask/__init__.py

@@ -1,5 +1,7 @@
 # flake8: noqa
-from fugue_version import __version__
+from importlib.metadata import version
+
+__version__ = version("fugue")
 
 from fugue_dask.dataframe import DaskDataFrame
 from fugue_dask.execution_engine import DaskExecutionEngine

fugue_dask/_utils.py

@@ -55,8 +55,7 @@ def hash_repartition(df: dd.DataFrame, num: int, cols: List[Any]) -> dd.DataFram
     if num == 1:
         return df.repartition(npartitions=1)
     df = df.reset_index(drop=True).clear_divisions()
-    idf, ct = _add_hash_index(df, num, cols)
-    return _postprocess(idf, ct, num)
+    return _add_hash_index(df, num, cols)
 
 
 def even_repartition(df: dd.DataFrame, num: int, cols: List[Any]) -> dd.DataFrame:
@@ -81,13 +80,9 @@ def even_repartition(df: dd.DataFrame, num: int, cols: List[Any]) -> dd.DataFram
         return df
     df = df.reset_index(drop=True).clear_divisions()
     if len(cols) == 0:
-        idf, ct = _add_continuous_index(df)
+        return _add_continuous_index(df, num=num)
     else:
-        idf, ct = _add_group_index(df, cols, shuffle=False)
-        # when cols are set and num is not set, we use the number of groups
-        if num <= 0:
-            num = ct
-    return _postprocess(idf, ct, num)
+        return _add_group_index(df, cols, shuffle=False, num=num)
 
 
 def rand_repartition(
@@ -114,25 +109,30 @@ def rand_repartition(
         return df.repartition(npartitions=1)
     df = df.reset_index(drop=True).clear_divisions()
     if len(cols) == 0:
-        idf, ct = _add_random_index(df, num=num, seed=seed)
+        return _add_random_index(df, num=num, seed=seed)
     else:
-        idf, ct = _add_group_index(df, cols, shuffle=True, seed=seed)
-        # when cols are set and num is not set, we use the number of groups
-    return _postprocess(idf, ct, num)
+        return _add_group_index(df, cols, shuffle=True, num=num, seed=seed)
 
 
-def _postprocess(idf: dd.DataFrame, ct: int, num: int) -> dd.DataFrame:
-    parts = min(ct, num)
+def _safe_set_index(df: dd.DataFrame, key_ct: int, num_partitions: int) -> dd.DataFrame:
+    if num_partitions <= 0:
+        num_partitions = key_ct
+    parts = min(key_ct, num_partitions)
     if parts <= 1:
-        return idf.repartition(npartitions=1)
-    divisions = list(np.arange(ct, step=math.ceil(ct / parts)))
-    divisions.append(ct - 1)
-    return idf.repartition(divisions=divisions, force=True)
+        return df.set_index(
+            _FUGUE_DASK_TEMP_IDX_COLUMN, drop=True, sort=True, npartitions=1
+        )
+    divisions = np.arange(key_ct, step=int(math.ceil(key_ct / parts))).tolist()
+    # divisions.append(ct - 1)
+    divisions.append(key_ct)
+    return df.set_index(
+        _FUGUE_DASK_TEMP_IDX_COLUMN, drop=True, sort=True, divisions=divisions
+    )
 
 
 def _add_group_index(
-    df: dd.DataFrame, cols: List[str], shuffle: bool, seed: Any = None
-) -> Tuple[dd.DataFrame, int]:
+    df: dd.DataFrame, cols: List[str], shuffle: bool, num: int, seed: Any = None
+) -> dd.DataFrame:
     keys = df[cols].drop_duplicates().compute()
     if shuffle:
         keys = keys.sample(frac=1, random_state=seed)
@@ -140,12 +140,10 @@ def _add_group_index(
         **{_FUGUE_DASK_TEMP_IDX_COLUMN: pd.Series(range(len(keys)), dtype=int)}
     )
     df = df.merge(dd.from_pandas(keys, npartitions=1), on=cols, broadcast=True)
-    return df.set_index(_FUGUE_DASK_TEMP_IDX_COLUMN, drop=True), len(keys)
+    return _safe_set_index(df, len(keys), num)
 
 
-def _add_hash_index(
-    df: dd.DataFrame, num: int, cols: List[str]
-) -> Tuple[dd.DataFrame, int]:
+def _add_hash_index(df: dd.DataFrame, num: int, cols: List[str]) -> dd.DataFrame:
     if len(cols) == 0:
         cols = list(df.columns)
 
@@ -165,13 +163,13 @@ def _add_hash_index(
     orig_schema = list(df.dtypes.to_dict().items())
     idf = df.map_partitions(
         _add_hash, meta=orig_schema + [(_FUGUE_DASK_TEMP_IDX_COLUMN, int)]
-    ).set_index(_FUGUE_DASK_TEMP_IDX_COLUMN, drop=True)
-    return idf, num
+    )
+    return _safe_set_index(idf, num, num)
 
 
 def _add_random_index(
     df: dd.DataFrame, num: int, seed: Any = None
-) -> Tuple[dd.DataFrame, int]:  # pragma: no cover
+) -> dd.DataFrame:  # pragma: no cover
     def _add_rand(df: pd.DataFrame) -> pd.DataFrame:
         if len(df) == 0:
             return df.assign(**{_FUGUE_DASK_TEMP_IDX_COLUMN: pd.Series(dtype=int)})
@@ -184,11 +182,11 @@ def _add_random_index(
     orig_schema = list(df.dtypes.to_dict().items())
     idf = df.map_partitions(
         _add_rand, meta=orig_schema + [(_FUGUE_DASK_TEMP_IDX_COLUMN, int)]
-    ).set_index(_FUGUE_DASK_TEMP_IDX_COLUMN, drop=True)
-    return idf, num
+    )
+    return _safe_set_index(idf, num, num)
 
 
-def _add_continuous_index(df: dd.DataFrame) -> Tuple[dd.DataFrame, int]:
+def _add_continuous_index(df: dd.DataFrame, num: int) -> dd.DataFrame:
     def _get_info(
         df: pd.DataFrame, partition_info: Any
     ) -> pd.DataFrame:  # pragma: no cover
@@ -216,8 +214,7 @@ def _add_continuous_index(df: dd.DataFrame) -> Tuple[dd.DataFrame, int]:
     idf = df.map_partitions(
         _add_index, meta=orig_schema + [(_FUGUE_DASK_TEMP_IDX_COLUMN, int)]
     )
-    idf = idf.set_index(_FUGUE_DASK_TEMP_IDX_COLUMN, drop=True)
-    return idf, counts[-1]
+    return _safe_set_index(idf, counts[-1], num)
 
 
 class DaskUtils(PandasLikeUtils[dd.DataFrame, dd.Series]):
@@ -255,7 +252,7 @@ class DaskUtils(PandasLikeUtils[dd.DataFrame, dd.Series]):
         schema: pa.Schema,
         use_extension_types: bool = True,
         use_arrow_dtype: bool = False,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> DataFrame:
         output_dtypes = to_pandas_dtype(
             schema,
@@ -268,7 +265,7 @@ class DaskUtils(PandasLikeUtils[dd.DataFrame, dd.Series]):
             use_extension_types=use_extension_types,
             use_arrow_dtype=use_arrow_dtype,
             meta=output_dtypes,
-            **kwargs
+            **kwargs,
         )
 
 

fugue_duckdb/execution_engine.py

@@ -64,7 +64,9 @@ class DuckDBEngine(SQLEngine):
         if isinstance(self.execution_engine, DuckExecutionEngine):
             con = self.execution_engine.connection
             tdf: DuckDataFrame = _to_duck_df(
-                self.execution_engine, df, create_view=False  # type: ignore
+                self.execution_engine,
+                df,
+                create_view=False,  # type: ignore
             )
             et = self._get_table(table)
             if et is not None:
@@ -96,7 +98,9 @@ class DuckDBEngine(SQLEngine):
         name_map: Dict[str, str] = {}
         for k, v in dfs.items():
             tdf: DuckDataFrame = _to_duck_df(
-                self.execution_engine, v, create_view=True  # type: ignore
+                self.execution_engine,
+                v,
+                create_view=True,  # type: ignore
             )
             name_map[k] = tdf.alias
         query = statement.construct(name_map, dialect=self.dialect, log=self.log)
@@ -415,7 +419,7 @@ class DuckExecutionEngine(ExecutionEngine):
         )
         tb = TempTableName()
         if frac is not None:
-            sql = f"SELECT * FROM {tb} USING SAMPLE bernoulli({frac*100} PERCENT)"
+            sql = f"SELECT * FROM {tb} USING SAMPLE bernoulli({frac * 100} PERCENT)"
         else:
             sql = f"SELECT * FROM {tb} USING SAMPLE reservoir({n} ROWS)"
         if seed is not None:

fugue_ibis/_utils.py

@@ -149,7 +149,7 @@ class LazyIbisAttr(LazyIbisObject):
             self._super_lazy_internal_objs["parent"],
             self._super_lazy_internal_objs["name"],
             *args,
-            **kwargs
+            **kwargs,
         )
 
 
@@ -196,7 +196,7 @@ def _materialize(obj: Any, context: Dict[int, Any]) -> Any:
         )
         v = f(
             *_materialize(obj._super_lazy_internal_objs["args"], context),
-            **_materialize(obj._super_lazy_internal_objs["kwargs"], context)
+            **_materialize(obj._super_lazy_internal_objs["kwargs"], context),
         )
     elif isinstance(obj, LazyIbisAttr):
         v = getattr(

fugue_notebook/__init__.py

@@ -1,7 +1,8 @@
 # flake8: noqa
 from typing import Any
+from importlib.metadata import version
 
-from fugue_version import __version__
+__version__ = version("fugue")
 from IPython import get_ipython
 from IPython.display import Javascript, display
 

fugue_ray/_utils/io.py

@@ -147,7 +147,8 @@ class RayIO(object):
                 f"prepartitioning by keys {by} is not supported by ray, will ignore"
             )
         return self._engine.repartition(
-            rdf, partition_spec=partition_spec  # type: ignore
+            rdf,
+            partition_spec=partition_spec,  # type: ignore
         )
 
     def _load_parquet(

fugue_spark/__init__.py

@@ -1,5 +1,7 @@
 # flake8: noqa
-from fugue_version import __version__
+from importlib.metadata import version
+
+__version__ = version("fugue")
 
 from fugue_spark.dataframe import SparkDataFrame
 from fugue_spark.execution_engine import SparkExecutionEngine

fugue_spark/_utils/convert.py

@@ -81,8 +81,9 @@ def to_cast_expression(
             name_match or allow_name_mismatch,
             lambda: ValueError(f"schema name mismatch: {schema1}, {schema2}"),
         )
-        n1, n2 = quote_name(schema1[i].name, quote="`"), quote_name(
-            schema2[i].name, quote="`"
+        n1, n2 = (
+            quote_name(schema1[i].name, quote="`"),
+            quote_name(schema2[i].name, quote="`"),
         )
         if schema1[i].dataType != schema2[i].dataType:
             type2 = schema2[i].dataType.simpleString()
@@ -90,9 +91,7 @@ def to_cast_expression(
                 schema2[i].dataType, (pt.StringType, pt.IntegralType)
             ):
                 expr.append(
-                    f"CAST(IF(isnan({n1}) OR {n1} IS NULL"
-                    f", NULL, {n1})"
-                    f" AS {type2}) {n2}"
+                    f"CAST(IF(isnan({n1}) OR {n1} IS NULL, NULL, {n1}) AS {type2}) {n2}"
                 )
             else:
                 expr.append(f"CAST({n1} AS {type2}) {n2}")

fugue_spark/_utils/misc.py

@@ -1,8 +1,9 @@
 import pyspark.sql as ps
+import pyspark
 from typing import Any
-from importlib.metadata import version
 
-SPARK_VERSION = version("pyspark").split(".")
+
+SPARK_VERSION = pyspark.__version__.split(".")
 
 try:
     if int(SPARK_VERSION[0]) >= 4:

fugue_spark/dataframe.py

@@ -178,9 +178,7 @@ class SparkDataFrame(DataFrame):
         self, n: int, columns: Optional[List[str]] = None
     ) -> LocalBoundedDataFrame:
         sdf = self._select_columns(columns)
-        return SparkDataFrame(
-            sdf.native.limit(n), sdf.schema
-        ).as_local()  # type: ignore
+        return SparkDataFrame(sdf.native.limit(n), sdf.schema).as_local()  # type: ignore
 
     @property
     def _first(self) -> Optional[List[Any]]:

fugue_sql/__init__.py

@@ -1,6 +1,8 @@
 # flake8: noqa
 # TODO: This folder is to be deprecated
-from fugue_version import __version__
+from importlib.metadata import version
+
+__version__ = version("fugue")
 
 import warnings
 from fugue import FugueSQLWorkflow, fsql

fugue_test/builtin_suite.py

@@ -53,9 +53,8 @@ from fugue import (
     register_transformer,
     transformer,
 )
-from fugue.column import col
+from fugue.column import col, lit
 from fugue.column import functions as ff
-from fugue.column import lit
 from fugue.exceptions import (
     FugueInterfacelessError,
     FugueWorkflowCompileError,

fugue-0.9.5.dist-info/entry_points.txt

@@ -1,11 +0,0 @@
-[fugue.plugins]
-dask = fugue_dask.registry[dask]
-duckdb = fugue_duckdb.registry[duckdb]
-ibis = fugue_ibis[ibis]
-polars = fugue_polars.registry[polars]
-ray = fugue_ray.registry[ray]
-spark = fugue_spark.registry[spark]
-
-[pytest11]
-fugue_test = fugue_test
-fugue_test_fixtures = fugue_test.fixtures

fugue_version/__init__.py

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