remove support for Python 3.10 - #691 (#694)

* remove support for Python 3.10 - #691

* SPEC000

* remove outdated version checks

Author: jGaboardi

.github/workflows/tests.yaml

@@ -31,8 +31,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         environment-file:
-          - ci/envs/310-oldest.yaml
-          - ci/envs/310-latest.yaml
+          - ci/envs/311-oldest.yaml
           - ci/envs/311-latest.yaml
           - ci/envs/312-latest.yaml
           - ci/envs/313-latest.yaml

ci/envs/310-latest.yaml

@@ -2,19 +2,19 @@ name: test
 channels:
   - conda-forge
 dependencies:
-  - python=3.10
-  - geopandas=0.12
+  - python=3.11
+  - geopandas=0.14
   - inequality
   - libpysal=4.12.0
   - mapclassify
-  - networkx=2.8
-  - numpy=1.24
+  - networkx=3.2
+  - numpy=1.25
   - packaging
-  - pandas>=1.5.1,<2
+  - pandas=2.0
   - shapely=2.0
-  - tqdm=4.63.0
-  - numba=0.57
-  - fiona<1.10
+  - tqdm=4.65
+  - numba=0.58
+  - fiona=1.10
   # testing
   - codecov
   - pytest

ci/envs/310-oldest.yaml renamed to ci/envs/311-oldest.yaml

@@ -5,13 +5,13 @@ dependencies:
   - python=3.13
   - geopandas
   - inequality
-  - libpysal>=4.12.0
+  - libpysal
   - mapclassify
   - networkx
   - osmnx
   - packaging
-  - pandas!=1.5.0
-  - shapely>=2
+  - pandas
+  - shapely
   - esda
   - tqdm
   - numba

docs/environment.yml

@@ -3,16 +3,16 @@ channels:
   - conda-forge
 dependencies:
   - python
-  - geopandas>=0.12.0
+  - geopandas>=0.14.0
   - inequality
   - jupyter
   - libpysal>=4.12.0
   - mapclassify
   - matplotlib
-  - networkx>=2.8
+  - networkx>=3.2
   - osmnx
-  - pandas>=1.5.1
+  - pandas>=2.0
   - shapely>=2
-  - tqdm>=4.63.0
+  - tqdm>=4.65
   - numba
   - esda

environment.yml

@@ -6,12 +6,10 @@
 import os
 import warnings
 
-import geopandas as gpd
 import networkx as nx
 import numpy as np
 import pandas as pd
 import shapely
-from packaging.version import Version
 from tqdm.auto import tqdm  # progress bar
 
 from .utils import _azimuth, deprecated, removed
@@ -30,8 +28,6 @@
     "Neighbors",
 ]
 
-GPD_GE_013 = Version(gpd.__version__) >= Version("0.13.0")
-
 
 @deprecated("orientation")
 class Orientation:
@@ -155,10 +151,7 @@ def __init__(self, gdf):
             )
         self.gdf = gdf
 
-        if GPD_GE_013:
-            inp, res = gdf.sindex.query(gdf.geometry, predicate="intersects")
-        else:
-            inp, res = gdf.sindex.query_bulk(gdf.geometry, predicate="intersects")
+        inp, res = gdf.sindex.query(gdf.geometry, predicate="intersects")
         left = gdf.geometry.take(inp).reset_index(drop=True)
         right = gdf.geometry.take(res).reset_index(drop=True)
         intersections = left.intersection(right).length
@@ -718,10 +711,7 @@ def __init__(self, gdf):
         self.gdf = gdf
         self.orientation = gdf.geometry.apply(self._orient)
 
-        if GPD_GE_013:
-            inp, res = gdf.sindex.query(gdf.geometry, predicate="intersects")
-        else:
-            inp, res = gdf.sindex.query_bulk(gdf.geometry, predicate="intersects")
+        inp, res = gdf.sindex.query(gdf.geometry, predicate="intersects")
         itself = inp == res
         inp = inp[~itself]
         res = res[~itself]

momepy/distribution.py

@@ -8,7 +8,6 @@
 import numpy as np
 import pandas as pd
 import scipy as sp
-from numpy.lib import NumpyVersion
 from tqdm.auto import tqdm  # progress bar
 
 from .utils import deprecated, removed
@@ -902,10 +901,7 @@ def __init__(
         elif weighted is None:
             data = data.set_index(unique_id)[values]
 
-            if NumpyVersion(np.__version__) >= "1.22.0":
-                method = {"method": interpolation}
-            else:
-                method = {"interpolation": interpolation}
+            method = {"method": interpolation}
 
             for index in tqdm(data.index, total=data.shape[0], disable=not verbose):
                 if index in spatial_weights.neighbors:

momepy/diversity.py

@@ -27,7 +27,6 @@
     "get_network_ratio",
 ]
 
-GPD_GE_013 = Version(gpd.__version__) >= Version("0.13.0")
 GPD_GE_10 = Version(gpd.__version__) >= Version("1.0dev")
 
 
@@ -443,14 +442,7 @@ def _enclosed_tessellation(
         enclosures["position"] = range(len(enclosures))
 
         # determine which polygons should be split
-        if GPD_GE_013:
-            inp, res = buildings.sindex.query(
-                enclosures.geometry, predicate="intersects"
-            )
-        else:
-            inp, res = buildings.sindex.query_bulk(
-                enclosures.geometry, predicate="intersects"
-            )
+        inp, res = buildings.sindex.query(enclosures.geometry, predicate="intersects")
         unique, counts = np.unique(inp, return_counts=True)
         splits = unique[counts > 1]
         single = unique[counts == 1]
@@ -1003,14 +995,7 @@ def enclosures(
             )
         additional = pd.concat([gdf.geometry for gdf in additional_barriers])
 
-        if GPD_GE_013:
-            inp, res = enclosures.sindex.query(
-                additional.geometry, predicate="intersects"
-            )
-        else:
-            inp, res = enclosures.sindex.query_bulk(
-                additional.geometry, predicate="intersects"
-            )
+        inp, res = enclosures.sindex.query(additional.geometry, predicate="intersects")
         unique = np.unique(res)
 
         new = []
@@ -1053,14 +1038,9 @@ def enclosures(
                 "`limit` requires a GeoDataFrame or GeoSeries with Polygon or "
                 "MultiPolygon geometry to be used with `clip=True`."
             )
-        if GPD_GE_013:
-            _, encl_index = final_enclosures.representative_point().sindex.query(
-                limit.geometry, predicate="contains"
-            )
-        else:
-            _, encl_index = final_enclosures.representative_point().sindex.query_bulk(
-                limit.geometry, predicate="contains"
-            )
+        _, encl_index = final_enclosures.representative_point().sindex.query(
+            limit.geometry, predicate="contains"
+        )
         keep = np.unique(encl_index)
         return final_enclosures.iloc[keep]
 

momepy/elements.py

@@ -1,10 +1,8 @@
-import geopandas as gpd
 import numpy as np
 import shapely
 from geopandas import GeoDataFrame, GeoSeries
 from libpysal.graph import Graph
 from numpy.typing import NDArray
-from packaging.version import Version
 from pandas import Series
 from scipy import sparse
 
@@ -20,8 +18,6 @@
     "cell_alignment",
 ]
 
-GPD_GE_013 = Version(gpd.__version__) >= Version("0.13.0")
-
 
 def orientation(geometry: GeoDataFrame | GeoSeries) -> Series:
     """Calculate the orientation of objects.
@@ -140,10 +136,7 @@ def shared_walls(
         geometry = geometry.buffer(tolerance)
         predicate = "intersects"
 
-    if GPD_GE_013:
-        inp, res = geometry.sindex.query(geometry.geometry, predicate=predicate)
-    else:
-        inp, res = geometry.sindex.query_bulk(geometry.geometry, predicate=predicate)
+    inp, res = geometry.sindex.query(geometry.geometry, predicate=predicate)
 
     mask = inp != res
     inp, res = inp[mask], res[mask]

momepy/functional/_distribution.py

@@ -1,7 +1,6 @@
 import warnings
 
 import geopandas as gpd
-import libpysal
 import numpy as np
 import pandas as pd
 import shapely
@@ -12,9 +11,7 @@
 from packaging.version import Version
 from pandas import MultiIndex, Series
 
-GPD_GE_013 = Version(gpd.__version__) >= Version("0.13.0")
 GPD_GE_10 = Version(gpd.__version__) >= Version("1.0dev")
-LPS_GE_411 = Version(libpysal.__version__) >= Version("4.11.dev")
 SHPLY_GE_210 = Version(shapely.__version__) >= Version("2.1.0")
 
 __all__ = [
@@ -260,12 +257,7 @@ def enclosed_tessellation(
     enclosures[index_name] = enclosures.index
 
     # figure out which enlosures contain which buildings
-    if GPD_GE_013:
-        inp, res = geometry.sindex.query(enclosures.geometry, predicate="intersects")
-    else:
-        inp, res = geometry.sindex.query_bulk(
-            enclosures.geometry, predicate="intersects"
-        )
+    inp, res = geometry.sindex.query(enclosures.geometry, predicate="intersects")
 
     # find out which enclosures contain one and multiple buildings
     unique, counts = np.unique(inp, return_counts=True)
@@ -752,10 +744,6 @@ def buffered_limit(
     <class 'shapely.geometry.polygon.Polygon'>
     """
     if buffer == "adaptive":
-        if not LPS_GE_411:
-            raise ImportError(
-                "Adaptive buffer requires libpysal 4.11 or higher."
-            )  # because https://github.com/pysal/libpysal/pull/709
         gabriel = Graph.build_triangulation(gdf.centroid, "gabriel", kernel="identity")
         max_dist = gabriel.aggregate("max")
         buffer = np.clip(max_dist / 2 + max_dist * 0.1, min_buffer, max_buffer).values