fix: circular import (#186)

Closes #184

Author: gadomski

.github/dependabot.yml

@@ -0,0 +1,31 @@
+version: 2
+updates:
+  # Cargo dependencies
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      cargo-dependencies:
+        patterns:
+          - "*"
+
+  # Python pip dependencies
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      pip-dependencies:
+        patterns:
+          - "*"
+
+  # GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/ci.yaml

@@ -31,23 +31,27 @@ jobs:
         os:
           - runner: ubuntu-latest
             duckdb-slug: linux-amd64
-          - runner: macos-latest
-            duckdb-slug: osx-universal
+          # Installing GDAL is just too slow, for now. We should cache eventually.
+          # - runner: macos-latest
+          #   duckdb-slug: osx-universal
           # https://github.com/stac-utils/rustac-py/issues/1
           # - windows-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v7
+        with:
+          python-version: ${{ matrix.python-version }}
       - uses: Swatinem/rust-cache@v2
-      - name: Install Python version
-        run: uv python install ${{ matrix.python-version }}
       - name: Install libduckdb
         run: |
           wget https://github.com/duckdb/duckdb/releases/download/v${{ env.duckdb-version }}/libduckdb-${{ matrix.os.duckdb-slug }}.zip
           mkdir -p ${{ github.workspace }}/opt/duckdb
           unzip libduckdb-${{ matrix.os.duckdb-slug }}.zip -d ${{ github.workspace }}/opt/duckdb
+      - name: Install GDAL
+        if: runner.os == 'macOS'
+        run: brew install gdal
       - name: Sync
         run: uv sync --all-extras
       - name: Lint
@@ -62,3 +66,22 @@ jobs:
         # not worth it to install cairo on macos
         if: runner.os == 'ubuntu-latest'
         run: uv run mkdocs build --strict
+  import:
+    name: Import
+    runs-on: ubuntu-latest
+    env:
+      DUCKDB_LIB_DIR: ${{ github.workspace }}/opt/duckdb
+      LD_LIBRARY_PATH: ${{ github.workspace }}/opt/duckdb
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: astral-sh/setup-uv@v7
+      - uses: Swatinem/rust-cache@v2
+      - name: Install libduckdb
+        run: |
+          wget https://github.com/duckdb/duckdb/releases/download/v${{ env.duckdb-version }}/libduckdb-linux-amd64.zip
+          mkdir -p ${{ github.workspace }}/opt/duckdb
+          unzip libduckdb-linux-amd64.zip -d ${{ github.workspace }}/opt/duckdb
+      - name: Import
+        run: uv run --no-default-groups python -c "import rustac"

pyproject.toml

@@ -52,6 +52,10 @@ exclude = [
     "_obstore",
 ]
 
+[tool.ruff.lint.per-file-ignores]
+"python/rustac/__init__.py" = ["F403", "F405"]
+
+
 [dependency-groups]
 dev = [
     "geopandas>=1.0.1",

python/rustac/__init__.py

@@ -1,56 +1,7 @@
 from __future__ import annotations
 
-from collections.abc import AsyncGenerator
-from contextlib import asynccontextmanager
-from typing import Any
+from .geoparquet import geoparquet_writer
+from .rustac import *
 
-from obstore.store import ObjectStore
-
-from . import store
-from .rustac import *  # noqa: F403
-
-
-@asynccontextmanager
-async def geoparquet_writer(
-    items: list[dict[str, Any]],
-    path: str,
-    drop_invalid_attributes: bool = True,
-    store: store.Store | ObjectStore | None = None,
-) -> AsyncGenerator[GeoparquetWriter]:  # noqa: F405
-    """Open a geoparquet writer in a context manager.
-
-    The items provided to the initial call will be used to build the geoparquet
-    schema. All subsequent items must have the same schema.
-
-    The underlying parquet writer will group batches of items into row groups
-    based upon it's default configuration; the row groups are _not_ determined
-    by the size of the item lists passed to the writer.
-
-    Args:
-        items: The STAC items
-        path: The path for the stac-geoparquet file
-        drop_invalid_attributes: If true, invalid attributes (e.g. an `id` in
-            the `properties` field) will be dropped. If false, raise an error if
-            an invalid attribute is encountered.
-        store: The optional object store to use for writing the geoparquet file.
-
-    Examples:
-
-        >>> async with geoparquet_writer(item_batches[0], "out.parquet") as w:
-        ...     for items in item_batches[1:]:
-        ...         await w.write(items)
-        ...
-        >>>
-    """
-    writer = await GeoparquetWriter.open(items, path, drop_invalid_attributes, store)  # noqa: F405
-    yield writer
-    await writer.finish()
-
-
-__doc__ = rustac.__doc__  # noqa: F405
-if hasattr(rustac, "__all__"):  # noqa: F405
-    __all__ = rustac.__all__  # noqa: F405
-else:
-    __all__ = []
-
-__all__.append("store")
+__doc__ = rustac.__doc__
+__all__ = rustac.__all__ + ["geoparquet_writer"]  # pyright: ignore[reportUnsupportedDunderAll, reportAttributeAccessIssue]

python/rustac/geoparquet.py

@@ -0,0 +1,42 @@
+from collections.abc import AsyncGenerator
+from contextlib import asynccontextmanager
+from typing import Any
+
+from .rustac import GeoparquetWriter
+
+
+@asynccontextmanager
+async def geoparquet_writer(
+    items: list[dict[str, Any]],
+    path: str,
+    drop_invalid_attributes: bool = True,
+    store=None,  # We don't type because the context manager is a PITA
+) -> AsyncGenerator[GeoparquetWriter]:
+    """Open a geoparquet writer in a context manager.
+
+    The items provided to the initial call will be used to build the geoparquet
+    schema. All subsequent items must have the same schema.
+
+    The underlying parquet writer will group batches of items into row groups
+    based upon it's default configuration; the row groups are _not_ determined
+    by the size of the item lists passed to the writer.
+
+    Args:
+        items: The STAC items
+        path: The path for the stac-geoparquet file
+        drop_invalid_attributes: If true, invalid attributes (e.g. an `id` in
+            the `properties` field) will be dropped. If false, raise an error if
+            an invalid attribute is encountered.
+        store: The optional object store to use for writing the geoparquet file.
+
+    Examples:
+
+        >>> async with geoparquet_writer(item_batches[0], "out.parquet") as w:
+        ...     for items in item_batches[1:]:
+        ...         await w.write(items)
+        ...
+        >>>
+    """
+    writer = await GeoparquetWriter.open(items, path, drop_invalid_attributes, store)
+    yield writer
+    await writer.finish()

python/rustac/rustac.pyi

@@ -14,12 +14,13 @@ AnyObjectStore = ObjectStore | ObstoreObjectStore
 class GeoparquetWriter:
     """A helper class to write geoparquet from batches of items."""
 
+    @staticmethod
     async def open(
         items: list[dict[str, Any]],
         path: str,
         drop_invalid_attributes: bool = True,
-        store: AnyObjectStore = None,
-    ) -> None:
+        store: AnyObjectStore | None = None,
+    ) -> GeoparquetWriter:
         """Creates a new writer for the provided items and the path.
 
         Args: