Merge remote-tracking branch 'upstream/main' into expr-first

Author: dangotbanned

.github/workflows/extremes.yml

@@ -9,7 +9,7 @@ jobs:
   minimum_versions:
     strategy:
       matrix:
-        python-version: ["3.8"]
+        python-version: ["3.9"]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
@@ -25,7 +25,7 @@ jobs:
           cache-suffix: ${{ matrix.python-version }}
           cache-dependency-glob: "pyproject.toml"
       - name: install-minimum-versions
-        run: uv pip install pipdeptree tox virtualenv setuptools pandas==0.25.3 polars==0.20.3 numpy==1.17.5 pyarrow==11.0.0 "pyarrow-stubs<17" scipy==1.5.0 scikit-learn==1.1.0 duckdb==1.0 tzdata backports.zoneinfo --system
+        run: uv pip install pipdeptree tox virtualenv setuptools pandas==1.1.3 polars==0.20.3 numpy==1.19.3 pyarrow==11.0.0 "pyarrow-stubs<17" scipy==1.6.0 scikit-learn==1.1.0 duckdb==1.0 tzdata --system
       - name: install-reqs
         run: |
           uv pip install -e . --group tests --system
@@ -34,11 +34,11 @@ jobs:
       - name: Assert dependencies
         run: |
           DEPS=$(uv pip freeze)
-          echo "$DEPS" | grep 'pandas==0.25.3'
+          echo "$DEPS" | grep 'pandas==1.1.3'
           echo "$DEPS" | grep 'polars==0.20.3'
-          echo "$DEPS" | grep 'numpy==1.17.5'
+          echo "$DEPS" | grep 'numpy==1.19.3'
           echo "$DEPS" | grep 'pyarrow==11.0.0'
-          echo "$DEPS" | grep 'scipy==1.5.0'
+          echo "$DEPS" | grep 'scipy==1.6.0'
           echo "$DEPS" | grep 'scikit-learn==1.1.0'
           echo "$DEPS" | grep 'duckdb==1.0'
       - name: Run pytest
@@ -47,7 +47,7 @@ jobs:
   pretty_old_versions:
     strategy:
       matrix:
-        python-version: ["3.8"]
+        python-version: ["3.9"]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -62,7 +62,7 @@ jobs:
           cache-suffix: ${{ matrix.python-version }}
           cache-dependency-glob: "pyproject.toml"
       - name: install-pretty-old-versions
-        run: uv pip install pipdeptree tox virtualenv setuptools pandas==1.1.5 polars==0.20.3 numpy==1.17.5 pyarrow==11.0.0 "pyarrow-stubs<17" scipy==1.5.0 scikit-learn==1.1.0 duckdb==1.0 tzdata backports.zoneinfo --system
+        run: uv pip install pipdeptree tox virtualenv setuptools pandas==1.1.5 polars==0.20.3 numpy==1.19.3 pyarrow==11.0.0 "pyarrow-stubs<17" scipy==1.6.0 scikit-learn==1.1.0 duckdb==1.0 tzdata --system
       - name: install-reqs
         run: uv pip install -e . --group tests --system
       - name: show-deps
@@ -74,9 +74,9 @@ jobs:
           DEPS=$(uv pip freeze)
           echo "$DEPS" | grep 'pandas==1.1.5'
           echo "$DEPS" | grep 'polars==0.20.3'
-          echo "$DEPS" | grep 'numpy==1.17.5'
+          echo "$DEPS" | grep 'numpy==1.19.3'
           echo "$DEPS" | grep 'pyarrow==11.0.0'
-          echo "$DEPS" | grep 'scipy==1.5.0'
+          echo "$DEPS" | grep 'scipy==1.6.0'
           echo "$DEPS" | grep 'scikit-learn==1.1.0'
           echo "$DEPS" | grep 'duckdb==1.0'
       - name: Run pytest

.github/workflows/pytest.yml

@@ -9,10 +9,10 @@ env:
   PY_COLORS: 1
 
 jobs:
-  pytest-38:
+  pytest-39:
     strategy:
       matrix:
-        python-version: ["3.8"]
+        python-version: ["3.9"]
         os: [windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -27,8 +27,7 @@ jobs:
           cache-suffix: ${{ matrix.python-version }}
           cache-dependency-glob: "pyproject.toml"
       - name: install-reqs
-        # Python3.8 is technically at end-of-life, so we don't test everything
-        run: uv pip install -e ".[pandas,polars,pyarrow]" backports.zoneinfo --group tests --system
+        run: uv pip install -e ".[pandas,polars,pyarrow]" --group tests --system
       - name: show-deps
         run: uv pip freeze
       - name: Run pytest

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
     # Run the formatter.
     - id: ruff-format
     # Run the linter.
-    - id: ruff
+    - id: ruff-check
       args: [--fix]
     - id: ruff
       name: check-docstrings
@@ -36,6 +36,8 @@ repos:
                 narwhals/dataframe\.py|
                 # TODO: gradually enable
                 narwhals/dependencies\.py|
+                # TODO: gradually enable
+                narwhals/stable/v1/dependencies\.py|
                 # private, so less urgent to document too well
                 narwhals/_.*|
                 ^utils/.*

narwhals/_arrow/dataframe.py

@@ -1,17 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Collection, Iterator, Mapping, Sequence
 from functools import partial
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Collection,
-    Iterator,
-    Literal,
-    Mapping,
-    Sequence,
-    cast,
-    overload,
-)
+from typing import TYPE_CHECKING, Any, Literal, cast, overload
 
 import pyarrow as pa
 import pyarrow.compute as pc

narwhals/_arrow/expr.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Sequence
+from typing import TYPE_CHECKING, Any
 
 import pyarrow.compute as pc
 
@@ -14,6 +14,8 @@
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from typing_extensions import Self
 
     from narwhals._arrow.dataframe import ArrowDataFrame

narwhals/_arrow/group_by.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import collections
-from typing import TYPE_CHECKING, Any, ClassVar, Iterator, Mapping, Sequence
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import pyarrow as pa
 import pyarrow.compute as pc
@@ -12,6 +12,8 @@
 from narwhals._utils import generate_temporary_column_name, requires
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator, Mapping, Sequence
+
     from narwhals._arrow.dataframe import ArrowDataFrame
     from narwhals._arrow.expr import ArrowExpr
     from narwhals._arrow.typing import (  # type: ignore[attr-defined]

narwhals/_arrow/namespace.py

@@ -3,7 +3,7 @@
 import operator
 from functools import reduce
 from itertools import chain
-from typing import TYPE_CHECKING, Literal, Sequence
+from typing import TYPE_CHECKING, Literal
 
 import pyarrow as pa
 import pyarrow.compute as pc
@@ -24,6 +24,8 @@
 from narwhals._utils import Implementation
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from narwhals._arrow.typing import Incomplete
     from narwhals._utils import Version
     from narwhals.typing import IntoDType, NonNestedLiteral

narwhals/_arrow/series.py

@@ -1,15 +1,6 @@
 from __future__ import annotations
 
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Iterable,
-    Iterator,
-    Mapping,
-    Sequence,
-    cast,
-    overload,
-)
+from typing import TYPE_CHECKING, Any, cast, overload
 
 import pyarrow as pa
 import pyarrow.compute as pc
@@ -44,6 +35,7 @@
 from narwhals.exceptions import InvalidOperationError
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator, Mapping, Sequence
     from types import ModuleType
 
     import pandas as pd

narwhals/_arrow/series_dt.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Mapping, cast
+from typing import TYPE_CHECKING, Any, Callable, ClassVar, cast
 
 import pyarrow as pa
 import pyarrow.compute as pc
@@ -9,6 +9,8 @@
 from narwhals._duration import parse_interval_string
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+
     from typing_extensions import TypeAlias
 
     from narwhals._arrow.series import ArrowSeries

narwhals/_arrow/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import lru_cache
-from typing import TYPE_CHECKING, Any, Iterable, Iterator, Mapping, Sequence, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import pyarrow as pa
 import pyarrow.compute as pc
@@ -11,6 +11,8 @@
 from narwhals.exceptions import ShapeError
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator, Mapping, Sequence
+
     from typing_extensions import TypeAlias, TypeIs
 
     from narwhals._arrow.series import ArrowSeries