Fix warnings in tests

Author: peterrrock2

maup/__init__.py

@@ -1,6 +1,6 @@
 import geopandas
 from .adjacencies import adjacencies
-from .assign import assign
+from .assign import assign, AssigmentWarning
 from .indexed_geometries import IndexedGeometries
 from .intersections import intersections, prorate
 from .repair import (
@@ -24,9 +24,10 @@
         "`geopandas.options.use_pygeos = False` before importing your shapefile."
     )
 
-__version__ = "2.0.2"
+__version__ = "2.0.3"
 __all__ = [
     "adjacencies",
+    "AssigmentWarning",
     "assign",
     "IndexedGeometries",
     "intersections",

maup/assign.py

@@ -6,6 +6,10 @@
 from .crs import require_same_crs
 
 
+class AssigmentWarning(UserWarning):
+    """Warning raised when some source geometries are not assigned to any target."""
+
+
 @require_same_crs
 def assign(sources, targets):
     """Assign source geometries to targets. A source is assigned to the
@@ -25,7 +29,10 @@ def assign(sources, targets):
     # Warn here if there are still unassigned source geometries.
     unassigned = sources[assignment.isna()]
     if len(unassigned):  # skip if done
-        warnings.warn("Warning: Some units in the source geometry were unassigned.")
+        warnings.warn(
+            "Warning: Some units in the source geometry were unassigned.",
+            AssigmentWarning,
+        )
 
     return assignment.astype(targets.index.dtype, errors="ignore")
 

maup/repair.py

@@ -497,7 +497,7 @@ def absorb_by_shared_perimeter(
 
     # This difference in indices is expected since not all target geometries may have sources
     # to absorb, so it would be nice to remove this warning.
-    result = targets.union(sources_to_absorb)
+    result = targets.union(sources_to_absorb, align=True)
 
     # The .union call only returns the targets who had a corresponding
     # source to absorb. Now we fill in all of the unchanged targets.

poetry.lock

@@ -30,6 +30,7 @@ geopandas = "^1.1.1"
 Shapely = "^2.1.1"
 tqdm = "^4.67.1"
 pyproj = ">=3.7.2" 
+pyogrio = "^0.11.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.4.1"
@@ -42,6 +43,7 @@ sphinx-copybutton = "^0.5.2"
 sphinx-rtd-theme = "^3.0.2"
 black = "^25.1.0"
 ipykernel = "^6.30.1"
+python-dateutil = "^2.9.0.post0"
 
 [build-system]
 requires = ["poetry-core>=2.0.0"]

pyproject.toml

@@ -1,9 +1,10 @@
 import geopandas
 import pandas
 from numpy import nan
+import pytest
 
 from maup import assign
-from maup.assign import assign_by_area, assign_by_covering
+from maup.assign import assign_by_area, assign_by_covering, AssigmentWarning
 
 
 def test_assign_assigns_geometries_when_they_nest_neatly(
@@ -147,7 +148,12 @@ def test_example_case():
     blocks.to_crs("EPSG:5070", inplace=True)
     precincts.to_crs("EPSG:5070", inplace=True)
     columns = ["TOTPOP", "BVAP", "WVAP", "HISP"]
-    assignment = assign(blocks, precincts)
+
+    with pytest.warns(
+        AssigmentWarning, match="Some units in the source geometry were unassigned."
+    ):
+        assignment = assign(blocks, precincts)
+
     precincts[columns] = blocks[columns].groupby(assignment).sum()
     assert (precincts[columns] > 0).sum().sum() > len(precincts)
     for col in columns:  # fails because it does not neatly cover

tests/test_assign.py

@@ -2,7 +2,7 @@
 import pandas
 import pytest
 
-from maup import assign, intersections, prorate, normalize
+from maup import assign, intersections, prorate, normalize, AssigmentWarning
 
 
 @pytest.fixture
@@ -85,8 +85,13 @@ def test_example_case():
     # like boundary intersections, which we do not want to include in
     # our proration.
     pieces = intersections(old_precincts, new_precincts, area_cutoff=0)
-    # Weight by prorated population from blocks
-    weights = blocks["TOTPOP"].groupby(assign(blocks, pieces)).sum()
+
+    with pytest.warns(
+        AssigmentWarning, match="Some units in the source geometry were unassigned."
+    ):
+        # Weight by prorated population from blocks
+        weights = blocks["TOTPOP"].groupby(assign(blocks, pieces)).sum()
+
     weights = normalize(weights, level=0)
     # Use blocks to estimate population of each piece
     new_precincts[columns] = prorate(pieces, old_precincts[columns], weights=weights)

tests/test_prorate.py

@@ -1,6 +1,7 @@
 import geopandas
 import maup
 from maup.repair import count_overlaps, autorepair, quick_repair
+from maup.assign import AssigmentWarning
 import pytest
 
 # These tests are losely based off the test_example_case in test_prorate.py
@@ -66,7 +67,13 @@ def test_crop_to():
 
     # Calculate without cropping
     pieces = maup.intersections(old_precincts, new_precincts, area_cutoff=0)
-    weights = blocks["TOTPOP"].groupby(maup.assign(blocks, pieces)).sum()
+
+    with pytest.warns(
+        AssigmentWarning, match="Some units in the source geometry were unassigned."
+    ):
+        # Weight by prorated population from blocks
+        weights = blocks["TOTPOP"].groupby(maup.assign(blocks, pieces)).sum()
+
     weights = maup.normalize(weights, level=0)
     new_precincts[columns] = maup.prorate(
         pieces, old_precincts[columns], weights=weights
@@ -76,7 +83,13 @@ def test_crop_to():
     old_precincts["geometries"] = maup.crop_to(old_precincts, new_precincts)
     new_precincts_cropped = new_precincts.copy()
     pieces = maup.intersections(old_precincts, new_precincts_cropped, area_cutoff=0)
-    weights = blocks["TOTPOP"].groupby(maup.assign(blocks, pieces)).sum()
+
+    with pytest.warns(
+        AssigmentWarning, match="Some units in the source geometry were unassigned."
+    ):
+        # Weight by prorated population from blocks
+        weights = blocks["TOTPOP"].groupby(maup.assign(blocks, pieces)).sum()
+
     weights = maup.normalize(weights, level=0)
     new_precincts_cropped[columns] = maup.prorate(
         pieces, old_precincts[columns], weights=weights