fastquadtree 2.0.2__tar.gz → 2.0.4__tar.gz

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/.github/workflows/docs.yml

@@ -14,7 +14,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
       - uses: actions/setup-python@v5
         with: { python-version: '3.11' }
-      - run: pip install -e '.[dev]'
-      - run: mkdocs gh-deploy --force
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+      - run: uv venv .venv
+      - run: uv sync --python .venv/bin/python --group dev
+      - run: uv run mkdocs gh-deploy --force

fastquadtree-2.0.4/.github/workflows/release.yml

@@ -0,0 +1,130 @@
+name: Publish to PyPI
+
+on:
+  push:
+    tags: ["v*"]
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Test build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+
+      - name: Create venv
+        run: uv venv .venv
+
+      # Installs your project editable + dev group deps (from [dependency-groups].dev)
+      - name: Install dev deps
+        run: uv sync --python .venv/bin/python --group dev
+
+      # Build extension into the venv so tests import the native module
+      - name: Build with maturin (develop)
+        run: uv run --python .venv/bin/python maturin develop --release
+
+      - name: Run Python tests
+        run: uv run --python .venv/bin/python pytest
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Run Rust tests
+        run: cargo test
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  build:
+    name: Build wheels
+    needs: test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Native wheels
+          - os: ubuntu-latest
+            maturin_args: "--release --sdist --out dist"
+            manylinux: "2_28"
+
+          - os: macos-latest
+            maturin_args: "--release --out dist --target universal2-apple-darwin"
+
+          - os: windows-latest
+            maturin_args: "--release --out dist"
+
+          # Linux cross-arch wheels
+          - os: ubuntu-latest
+            maturin_args: "--release --out dist --target aarch64-unknown-linux-gnu"
+            manylinux: "2_28"
+
+          - os: ubuntu-latest
+            maturin_args: "--release --out dist --target armv7-unknown-linux-gnueabihf"
+            manylinux: "2_28"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # Keep Python simple here; maturin-action brings its own Python(s) for builds.
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Build wheels with maturin
+        uses: PyO3/maturin-action@v1
+        with:
+          command: build
+          args: ${{ matrix.maturin_args }}
+          manylinux: ${{ matrix.manylinux }}
+
+      - name: Upload dist artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-${{ runner.os }}-${{ matrix.maturin_args }}
+          path: dist/*
+
+  publish:
+    name: Publish distributions to PyPI
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write # for Trusted Publisher (recommended)
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Download all dist artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: dist-*
+          path: dist
+          merge-multiple: true
+
+      # Option A (recommended): PyPI Trusted Publisher (OIDC), no token needed.
+      # - name: Publish (Trusted Publisher)
+      #   run: uv publish dist/*
+
+      # Option B: Token-based publish.
+      - name: Publish (Token)
+        env:
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+        run: uv publish dist/*

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/.github/workflows/test.yml

@@ -1,14 +1,8 @@
-# .github/workflows/test.yml
 name: Test
 on:
   push:
     branches: [ main ]
 
-permissions:
-  contents: write
-  pages: write
-  id-token: write
-
 jobs:
   test:
     name: Test build (Python ${{ matrix.python-version }})
@@ -26,32 +20,27 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-          cache: "pip"
-        
-      - name: Create venv for maturin develop
-        run: python -m venv .venv
 
-      - name: Build with maturin into this Python
-        uses: PyO3/maturin-action@v1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
         with:
-          command: develop
-          args: --release
-          manylinux: manylinux2014
+          enable-cache: true
 
-      - name: Install Python test deps into .venv
-        run: |
-          . .venv/bin/activate
-          pip install -e '.[dev]'
+      - name: Create venv (uv)
+        run: uv venv .venv
 
-      - name: Run Python tests
-        run: |
-          . .venv/bin/activate
-          pytest
+      - name: Build with maturin into this Python
+        run: uv run --python .venv/bin/python maturin develop --release
+        env:
+          # keeps your manylinux intent for Linux builds in other workflows;
+          # for develop on ubuntu-latest this is mostly irrelevant
+          MATURIN_MANYLINUX: "2_28"
+
+      - name: Install dev deps (uv)
+        run: uv sync --python .venv/bin/python --group dev
 
       - name: Run Python tests
-        run: |
-          . .venv/bin/activate
-          pytest
+        run: uv run --python .venv/bin/python pytest
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/Cargo.lock

@@ -30,7 +30,7 @@ dependencies = [
 
 [[package]]
 name = "fastquadtree"
-version = "2.0.2"
+version = "2.0.4"
 dependencies = [
  "bincode",
  "num-traits",

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fastquadtree"
-version = "2.0.2"
+version = "2.0.4"
 edition = "2021"
 readme = "README.md"
 

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastquadtree
-Version: 2.0.2
+Version: 2.0.4
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Rust
@@ -11,33 +11,16 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Typing :: Typed
 Classifier: License :: OSI Approved :: MIT License
-Requires-Dist: ruff>=0.6.0 ; extra == 'dev'
-Requires-Dist: pytest>=8.4.2 ; extra == 'dev'
-Requires-Dist: pytest-cov>=7.0.0 ; extra == 'dev'
-Requires-Dist: coverage>=7.5 ; extra == 'dev'
-Requires-Dist: mypy>=1.10 ; extra == 'dev'
-Requires-Dist: build>=1.2.1 ; extra == 'dev'
-Requires-Dist: mkdocs>=1.6 ; extra == 'dev'
-Requires-Dist: mkdocs-material ; extra == 'dev'
-Requires-Dist: mkdocstrings[python] ; extra == 'dev'
-Requires-Dist: mkdocs-autorefs ; extra == 'dev'
-Requires-Dist: mkdocs-git-revision-date-localized-plugin ; extra == 'dev'
-Requires-Dist: mkdocs-minify-plugin ; extra == 'dev'
-Requires-Dist: maturin>=1.5 ; extra == 'dev'
-Requires-Dist: pyqtree==1.0.0 ; extra == 'dev'
-Requires-Dist: numpy ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Provides-Extra: dev
 License-File: LICENSE
 Summary: Rust-accelerated quadtree for Python with fast inserts, range queries, and k-NN search.
 Keywords: quadtree,spatial-index,geometry,rust,pyo3,nearest-neighbor,k-nn
 Author: Ethan Anderson
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Project-URL: Homepage, https://github.com/Elan456/fastquadtree
-Project-URL: Repository, https://github.com/Elan456/fastquadtree
 Project-URL: Documentation, https://elan456.github.io/fastquadtree/
+Project-URL: Homepage, https://github.com/Elan456/fastquadtree
 Project-URL: Issues, https://github.com/Elan456/fastquadtree/issues
+Project-URL: Repository, https://github.com/Elan456/fastquadtree
 
 # fastquadtree
 
@@ -113,9 +96,8 @@ fastquadtree **outperforms** all other quadtree Python packages, including the R
 ![Total time](https://raw.githubusercontent.com/Elan456/fastquadtree/main/assets/quadtree_bench_time.png)
 ![Throughput](https://raw.githubusercontent.com/Elan456/fastquadtree/main/assets/quadtree_bench_throughput.png)
 
-### Summary (largest dataset, PyQtree baseline)
+### Summary (PyQtree baseline, sorted by total time)
 - Points: **500,000**, Queries: **500**
-- Fastest total: **fastquadtree** at **0.067 s**
 
 | Library | Build (s) | Query (s) | Total (s) | Speed vs PyQtree |
 |---|---:|---:|---:|---:|

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/README.md

@@ -72,9 +72,8 @@ fastquadtree **outperforms** all other quadtree Python packages, including the R
 ![Total time](https://raw.githubusercontent.com/Elan456/fastquadtree/main/assets/quadtree_bench_time.png)
 ![Throughput](https://raw.githubusercontent.com/Elan456/fastquadtree/main/assets/quadtree_bench_throughput.png)
 
-### Summary (largest dataset, PyQtree baseline)
+### Summary (PyQtree baseline, sorted by total time)
 - Points: **500,000**, Queries: **500**
-- Fastest total: **fastquadtree** at **0.067 s**
 
 | Library | Build (s) | Query (s) | Total (s) | Speed vs PyQtree |
 |---|---:|---:|---:|---:|

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/benchmarks/quadtree_bench/engines.py

@@ -5,7 +5,7 @@ This module provides a unified interface for different quadtree libraries,
 allowing fair comparison of their performance characteristics.
 """
 
-from typing import Any, Callable, Dict, List, Optional, Tuple
+from typing import Any, Callable, Optional
 
 import numpy as np
 from pyqtree import Index as PyQTree  # Pyqtree
@@ -30,8 +30,8 @@ class Engine:
         self,
         name: str,
         color: str,
-        build_fn: Callable[[List[Tuple[int, int]]], Any],
-        query_fn: Callable[[Any, List[Tuple[int, int, int, int]]], None],
+        build_fn: Callable[[list[tuple[int, int]]], Any],
+        query_fn: Callable[[Any, list[tuple[int, int, int, int]]], None],
     ):
         """
         Initialize an engine adapter.
@@ -47,17 +47,17 @@ class Engine:
         self._build = build_fn
         self._query = query_fn
 
-    def build(self, points: List[Tuple[int, int]]) -> Any:
+    def build(self, points: list[tuple[int, int]]) -> Any:
         """Build a tree from the given points."""
         return self._build(points)
 
-    def query(self, tree: Any, queries: List[Tuple[int, int, int, int]]) -> None:
+    def query(self, tree: Any, queries: list[tuple[int, int, int, int]]) -> None:
         """Execute queries on the tree."""
         return self._query(tree, queries)
 
 
 def _create_e_pyquadtree_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Engine:
     """Create engine adapter for e-pyquadtree."""
 
@@ -80,7 +80,7 @@ def _create_e_pyquadtree_engine(
 
 
 def _create_pyqtree_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Engine:
     """Create engine adapter for PyQtree."""
 
@@ -98,7 +98,7 @@ def _create_pyqtree_engine(
 
 
 def _create_fastquadtree_np_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Engine:
     """Create engine adapter for fastquadtree but queries are returned as numpy arrays instead of Python lists."""
 
@@ -120,7 +120,7 @@ def _create_fastquadtree_np_engine(
 
 
 def _create_fastquadtree_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Engine:
     """Create engine adapter for fastquadtree."""
 
@@ -142,7 +142,7 @@ def _create_fastquadtree_engine(
 
 
 def _create_fastquadtree_items_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Engine:
     """Create engine adapter for fastquadtree."""
 
@@ -164,7 +164,7 @@ def _create_fastquadtree_items_engine(
 
 
 def _create_quads_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Optional[Engine]:
     """Create engine adapter for quads library (optional)."""
     try:
@@ -194,7 +194,7 @@ def _create_quads_engine(
 
 
 def _create_nontree_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Optional[Engine]:
     """Create engine adapter for nontree library (optional)."""
     try:
@@ -227,7 +227,7 @@ def _create_nontree_engine(
 
 
 def _create_brute_force_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Engine:
     """Create engine adapter for brute force search (always available)."""
 
@@ -252,7 +252,7 @@ def _create_brute_force_engine(
 
 
 def _create_rtree_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Optional[Engine]:
     """Create engine adapter for rtree library (optional)."""
     try:
@@ -286,11 +286,11 @@ def _create_rtree_engine(
 
 
 def _create_strtree_engine(
-    bounds: Tuple[int, int, int, int], max_points: int, max_depth: int
+    bounds: tuple[int, int, int, int], max_points: int, max_depth: int
 ) -> Optional[Engine]:
     """Create engine adapter for Shapely STRtree (optional)."""
 
-    def build(points_list: List[Tuple[int, int]]):
+    def build(points_list: list[tuple[int, int]]):
         # Build geometries efficiently
 
         xs = np.fromiter(
@@ -305,7 +305,7 @@ def _create_strtree_engine(
         # Keep geoms alive next to the tree
         return (tree, geoms)
 
-    def query(built, queries: List[Tuple[int, int, int, int]]):
+    def query(built, queries: list[tuple[int, int, int, int]]):
         tree, _geoms = built
         for xmin, ymin, xmax, ymax in queries:
             window = shp_box(xmin, ymin, xmax, ymax)
@@ -319,10 +319,10 @@ def _create_strtree_engine(
 
 
 def get_engines(
-    bounds: Tuple[int, int, int, int] = (0, 0, 1000, 1000),
+    bounds: tuple[int, int, int, int] = (0, 0, 1000, 1000),
     max_points: int = 20,
     max_depth: int = 10,
-) -> Dict[str, Engine]:
+) -> dict[str, Engine]:
     """
     Get all available engine adapters.
 

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/benchmarks/quadtree_bench/plotting.py

@@ -5,7 +5,7 @@ This module handles creation of performance charts, graphs, and visualizations
 for benchmark results analysis.
 """
 
-from typing import Any, Dict, Tuple
+from typing import Any
 
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
@@ -14,7 +14,7 @@ from plotly.subplots import make_subplots
 class PlotManager:
     """Manages creation and export of benchmark visualization plots."""
 
-    def __init__(self, results: Dict[str, Any]):
+    def __init__(self, results: dict[str, Any]):
         """Initialize with benchmark results."""
         self.results = results
         self.config = results["config"]
@@ -29,7 +29,7 @@ class PlotManager:
             horizontal_spacing=0.08,
         )
 
-        def add_time_traces(y_data: Dict[str, list], col: int):
+        def add_time_traces(y_data: dict[str, list], col: int):
             """Add traces for a specific time metric."""
             show_legend = col == 1  # Only show legend for first column
             for name in list(y_data.keys()):
@@ -160,7 +160,7 @@ class PlotManager:
 
         return fig
 
-    def create_all_plots(self) -> Tuple[go.Figure, go.Figure]:
+    def create_all_plots(self) -> tuple[go.Figure, go.Figure]:
         """Create all benchmark plots."""
         time_fig = self.create_time_plots()
         throughput_fig = self.create_throughput_plots()

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/benchmarks/system_info_collector.py

@@ -3,7 +3,7 @@ import json
 import platform
 import shutil
 import subprocess
-from typing import Any, Dict
+from typing import Any
 
 import cpuinfo
 import distro
@@ -67,7 +67,7 @@ def _collect_gpus() -> list[dict]:
     return gpus
 
 
-def collect_system_info() -> Dict[str, Any]:
+def collect_system_info() -> dict[str, Any]:
     info = {
         "os": {
             "system": platform.system(),

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/docs/benchmark.md

@@ -12,7 +12,7 @@ Quadtrees are the focus of the benchmark, but Rtrees are included for reference.
 
 ### Summary (largest dataset, PyQtree baseline)
 - Points: **500,000**, Queries: **500**
-- Fastest total: **fastquadtree** at **0.089 s**
+- Fastest total: **fastquadtree** at **0.078 s**
 
 | Library | Build (s) | Query (s) | Total (s) | Speed vs PyQtree |
 |---|---:|---:|---:|---:|

{fastquadtree-2.0.2 → fastquadtree-2.0.4}/interactive/ballpit.py

@@ -1,7 +1,7 @@
 import math
 import random
 import time
-from typing import Iterable, List, Set, Tuple
+from collections.abc import Iterable
 
 import pygame
 from pyqtree import Index as PyQIndex
@@ -20,7 +20,7 @@ class Ball:
         x: float,
         y: float,
         r: int = 10,
-        color: Tuple[int, int, int] = (255, 0, 0),
+        color: tuple[int, int, int] = (255, 0, 0),
         vx: float = 0.0,
         vy: float = 0.0,
         mass: float = 1.0,
@@ -35,7 +35,7 @@ class Ball:
         self.mass = float(mass)
         self.restitution = float(restitution)
 
-    def aabb(self) -> Tuple[float, float, float, float]:
+    def aabb(self) -> tuple[float, float, float, float]:
         return (self.x - self.r, self.y - self.r, self.x + self.r, self.y + self.r)
 
     def integrate(self, ax: float, ay: float, dt: float):
@@ -117,7 +117,7 @@ def resolve_ball_ball(a: Ball, b: Ball):
 class SpatialBase:
     name = "base"
 
-    def rebuild(self, balls: List[Ball], width: int, height: int) -> None:
+    def rebuild(self, balls: list[Ball], width: int, height: int) -> None:
         raise NotImplementedError
 
     def neighbors(self, b: Ball) -> Iterable[Ball]:
@@ -133,7 +133,7 @@ class FastQTIndex(SpatialBase):
         self.capacity = capacity
         self.qt = Quadtree((0, 0, width, height), capacity)
 
-    def rebuild(self, balls: List[Ball], width: int, height: int) -> None:
+    def rebuild(self, balls: list[Ball], width: int, height: int) -> None:
         if width != self.width or height != self.height:
             self.width, self.height = width, height
             self.qt.clear()
@@ -142,7 +142,7 @@ class FastQTIndex(SpatialBase):
 
         self.qt.insert_many([(b.x, b.y) for b in balls])
 
-    def neighbors(self, b: Ball, balls: List[Ball]) -> Iterable[Ball]:
+    def neighbors(self, b: Ball, balls: list[Ball]) -> Iterable[Ball]:
         r2 = 2 * b.r
         min_x, min_y, max_x, max_y = b.x - r2, b.y - r2, b.x + r2, b.y + r2
         neighbors = self.qt.query((min_x, min_y, max_x, max_y))
@@ -166,7 +166,7 @@ class PyQTreeIndex(SpatialBase):
             bbox=(0, 0, width, height), max_items=max_items, max_depth=max_depth
         )
 
-    def rebuild(self, balls: List[Ball], width: int, height: int) -> None:
+    def rebuild(self, balls: list[Ball], width: int, height: int) -> None:
         if width != self.width or height != self.height:
             self.width, self.height = width, height
             self.idx = PyQIndex(
@@ -196,10 +196,10 @@ class PyQTreeIndex(SpatialBase):
 class BruteIndex(SpatialBase):
     name = "bruteforce"
 
-    def __init__(self, balls_ref: List[Ball]):
+    def __init__(self, balls_ref: list[Ball]):
         self._balls = balls_ref
 
-    def rebuild(self, balls: List[Ball], width: int, height: int) -> None:
+    def rebuild(self, balls: list[Ball], width: int, height: int) -> None:
         # Nothing to build
         pass
 
@@ -218,7 +218,7 @@ class BallPit:
         self.width = width
         self.height = height
 
-        self.balls: List[Ball] = []
+        self.balls: list[Ball] = []
         self.pair_checks = 0  # updated each frame
 
         # Spatial backends
@@ -279,7 +279,7 @@ class BallPit:
 
         # 3) Neighborhood checks with dedup on object id pairs
         self.pair_checks = 0
-        processed: Set[Tuple[int, int]] = set()
+        processed: set[tuple[int, int]] = set()
         for a in self.balls:
             start = time.perf_counter()
             if self.mode == "fastquadtree":