fastquadtree 0.4.0__tar.gz → 0.4.2__tar.gz

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

@@ -0,0 +1,77 @@
+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: Create venv for maturin develop
+        run: python -m venv .venv
+
+      - name: Build with maturin & install into .venv
+        uses: PyO3/maturin-action@v1
+        with:
+          command: develop
+          args: --release
+          manylinux: manylinux2014
+
+      - name: Install Python test deps into .venv
+        run: |
+          . .venv/bin/activate
+          pip install -U pip pytest pytest-cov
+
+      - name: Run Python tests
+        run: |
+          . .venv/bin/activate
+          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:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            args: "--skip-existing"
+          - os: macos-latest
+            args: "--skip-existing --target universal2-apple-darwin"
+          - os: windows-latest
+            args: "--skip-existing"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - name: Build and publish with maturin
+        uses: PyO3/maturin-action@v1
+        env:
+          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+        with:
+          command: publish
+          args: ${{ matrix.args }}
+          manylinux: manylinux2014

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/.pre-commit-config.yaml

@@ -31,16 +31,7 @@ repos:
       # This both runs pytest and generates .coverage data
       - id: pytest
         name: pytest (under coverage)
-        entry: bash -c "coverage run -m pytest -q"
+        entry: pytest
         language: system
         pass_filenames: false
-        always_run: true
-
-      # 4) Coverage threshold check
-      # Change FAIL_UNDER to your target percent
-      - id: coverage-report
-        name: coverage report
-        entry: bash -c 'coverage report --omit="tests/*" --fail-under=85'
-        language: system
-        pass_filenames: false
-        always_run: true
+        always_run: true

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/Cargo.lock

@@ -22,7 +22,7 @@ checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "fastquadtree"
-version = "0.4.0"
+version = "0.4.2"
 dependencies = [
  "pyo3",
 ]

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/Cargo.toml

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

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastquadtree
-Version: 0.4.0
+Version: 0.4.2
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Rust
@@ -23,7 +23,22 @@ Project-URL: Issues, https://github.com/Elan456/fastquadtree/issues
 
 # fastquadtree
 
-[![PyPI Downloads](https://static.pepy.tech/personalized-badge/fastquadtree?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=BLUE&left_text=downloads)](https://pepy.tech/projects/fastquadtree)
+[![PyPI version](https://img.shields.io/pypi/v/fastquadtree.svg)](https://pypi.org/project/fastquadtree/)
+[![Python versions](https://img.shields.io/pypi/pyversions/fastquadtree.svg)](https://pypi.org/project/fastquadtree/)
+[![Wheels](https://img.shields.io/pypi/wheel/fastquadtree.svg)](https://pypi.org/project/fastquadtree/#files)
+[![License: MIT](https://img.shields.io/pypi/l/fastquadtree.svg)](LICENSE)
+
+[![Downloads total](https://static.pepy.tech/badge/fastquadtree)](https://pepy.tech/projects/fastquadtree)
+[![Downloads month](https://static.pepy.tech/badge/fastquadtree/month)](https://pepy.tech/projects/fastquadtree)
+
+[![Build](https://github.com/Elan456/fastquadtree/actions/workflows/release.yml/badge.svg)](https://github.com/Elan456/fastquadtree/actions/workflows/ci.yml)
+[![Codecov](https://codecov.io/gh/Elan456/fastquadtree/branch/main/graph/badge.svg)](https://codecov.io/gh/Elan456/fastquadtree)
+
+[![Rust core via PyO3](https://img.shields.io/badge/Rust-core%20via%20PyO3-orange)](https://pyo3.rs/)
+[![Built with maturin](https://img.shields.io/badge/Built%20with-maturin-1f6feb)](https://www.maturin.rs/)
+[![Code style: Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Type checking: mypy](https://img.shields.io/badge/type%20checking-mypy-2a6db2)](http://mypy-lang.org/)
+
 
 ![Interactive_V2_Screenshot](https://raw.githubusercontent.com/Elan456/fastquadtree/main/assets/interactive_v2_screenshot.png)
 
@@ -86,7 +101,7 @@ id1 = qt_tracked.insert((50, 50), obj=player1)
 id2 = qt_tracked.insert((150, 150), obj=player2)
 
 # Delete by object reference (O(1) lookup!)
-deleted = qt_tracked.delete_by_object(player1, (50, 50))
+deleted = qt_tracked.delete_by_object(player1)
 print(f"Deleted player: {deleted}")  # True
 ```
 

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/README.md

@@ -1,6 +1,21 @@
 # fastquadtree
 
-[![PyPI Downloads](https://static.pepy.tech/personalized-badge/fastquadtree?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=BLUE&left_text=downloads)](https://pepy.tech/projects/fastquadtree)
+[![PyPI version](https://img.shields.io/pypi/v/fastquadtree.svg)](https://pypi.org/project/fastquadtree/)
+[![Python versions](https://img.shields.io/pypi/pyversions/fastquadtree.svg)](https://pypi.org/project/fastquadtree/)
+[![Wheels](https://img.shields.io/pypi/wheel/fastquadtree.svg)](https://pypi.org/project/fastquadtree/#files)
+[![License: MIT](https://img.shields.io/pypi/l/fastquadtree.svg)](LICENSE)
+
+[![Downloads total](https://static.pepy.tech/badge/fastquadtree)](https://pepy.tech/projects/fastquadtree)
+[![Downloads month](https://static.pepy.tech/badge/fastquadtree/month)](https://pepy.tech/projects/fastquadtree)
+
+[![Build](https://github.com/Elan456/fastquadtree/actions/workflows/release.yml/badge.svg)](https://github.com/Elan456/fastquadtree/actions/workflows/ci.yml)
+[![Codecov](https://codecov.io/gh/Elan456/fastquadtree/branch/main/graph/badge.svg)](https://codecov.io/gh/Elan456/fastquadtree)
+
+[![Rust core via PyO3](https://img.shields.io/badge/Rust-core%20via%20PyO3-orange)](https://pyo3.rs/)
+[![Built with maturin](https://img.shields.io/badge/Built%20with-maturin-1f6feb)](https://www.maturin.rs/)
+[![Code style: Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Type checking: mypy](https://img.shields.io/badge/type%20checking-mypy-2a6db2)](http://mypy-lang.org/)
+
 
 ![Interactive_V2_Screenshot](https://raw.githubusercontent.com/Elan456/fastquadtree/main/assets/interactive_v2_screenshot.png)
 
@@ -63,7 +78,7 @@ id1 = qt_tracked.insert((50, 50), obj=player1)
 id2 = qt_tracked.insert((150, 150), obj=player2)
 
 # Delete by object reference (O(1) lookup!)
-deleted = qt_tracked.delete_by_object(player1, (50, 50))
+deleted = qt_tracked.delete_by_object(player1)
 print(f"Deleted player: {deleted}")  # True
 ```
 

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/benchmarks/quadtree_bench/engines.py

@@ -247,7 +247,7 @@ def get_engines(
         "fastquadtree": _create_fastquadtree_engine(bounds, max_points, max_depth),
         "e-pyquadtree": _create_e_pyquadtree_engine(bounds, max_points, max_depth),
         "PyQtree": _create_pyqtree_engine(bounds, max_points, max_depth),
-        "Brute force": _create_brute_force_engine(bounds, max_points, max_depth),
+        #    "Brute force": _create_brute_force_engine(bounds, max_points, max_depth),  # Brute force doesn't scale well on the graphs so omit it from the main set
     }
 
     # Optional engines (only include if import succeeded)

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/pyproject.toml

@@ -39,3 +39,18 @@ module-name = "fastquadtree._native"
 # Choose a wide wheel tag for Linux. Adjust if your build images are newer.
 # Options include: manylinux2014, manylinux_2_28, musllinux_1_2, or "off".
 compatibility = "manylinux2014"
+
+[tool.pytest.ini_options]
+addopts = "--cov=fastquadtree --cov-branch --cov-report=xml --cov-fail-under=95"
+testpaths = ["tests"]  # still run tests
+
+[tool.coverage.run]
+source = ["fastquadtree"]
+omit = [
+  "tests/*",
+]
+
+[tool.coverage.report]
+omit = [
+  "tests/*",
+]

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/pysrc/fastquadtree/_bimap.py

@@ -80,11 +80,11 @@ class BiMap:
         """
         removed = None
         # Remove by id first
-        if self._id_to_item.get(item.id) is item:
-            removed = self._id_to_item.pop(item.id)
+        removed = self._id_to_item.pop(item.id)
+
         # Remove by obj side
         obj = item.obj
-        if obj is not None and self._objid_to_item.get(id(obj)) is item:
+        if obj is not None:
             self._objid_to_item.pop(id(obj), None)
             removed = removed or item
         return removed

{fastquadtree-0.4.0 → fastquadtree-0.4.2}/tests/test_wrapper_edges.py

@@ -207,3 +207,20 @@ def test_insert_many_points_exception_for_out_of_bounds():
 
     with pytest.raises(ValueError):
         qt.insert_many_points(points)
+
+
+def test_auto_id_collision_prevention():
+    qt = QuadTree(BOUNDS, capacity=8, track_objects=True)
+    id1 = qt.insert((10, 10))  # auto ID
+
+    id2 = qt.insert((20, 20), id=200)  # Large ID
+
+    # Next auto ID should be 201
+    id3 = qt.insert((30, 30))  # auto ID
+
+    assert id3 == 201
+    assert len(qt) == 3
+    assert id1 != id2 != id3
+
+    id4 = qt.insert((40, 40), id=150)  # Manual ID lower than current auto ID
+    assert id4 == 150

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

@@ -1,37 +0,0 @@
-name: Publish to PyPI
-
-on:
-  push:
-    tags:
-      - "v*"
-  release:
-    types: [published]
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build wheels
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            args: "--skip-existing"
-          - os: macos-latest
-            args: "--skip-existing --target universal2-apple-darwin"
-          - os: windows-latest
-            args: "--skip-existing"
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-      - name: Build and publish with maturin
-        uses: PyO3/maturin-action@v1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-        with:
-          command: publish
-          args: ${{ matrix.args }}
-          manylinux: manylinux2014