resolve iteritems() warnings and others (#436)

jGaboardi · martinfleis · web-flow · commit 9658c7b90ca0 · 2022-10-10T20:21:32.000+02:00
* resolve iteritems() warnings

* fix more warnings

* pin libpysal&gt;=4.6.0

* change libpysal requirement in docs

Co-authored-by: Martin Fleischmann &lt;martin@martinfleischmann.net&gt;
diff --git a/ci/envs/310-dev.yaml b/ci/envs/310-dev.yaml
@@ -6,7 +6,7 @@ dependencies:
   - dask
   - geopandas
   - inequality
-  - libpysal
+  - libpysal>=4.6.0
   - networkx
   - osmnx
   - packaging
diff --git a/ci/envs/310-latest.yaml b/ci/envs/310-latest.yaml
@@ -5,7 +5,7 @@ dependencies:
   - python=3.10
   - geopandas
   - inequality
-  - libpysal
+  - libpysal>=4.6.0
   - mapclassify
   - networkx
   - packaging
diff --git a/ci/envs/38-minimal.yaml b/ci/envs/38-minimal.yaml
@@ -5,7 +5,7 @@ dependencies:
   - python=3.8
   - geopandas=0.8
   - inequality
-  - libpysal=4.2.2
+  - libpysal=4.6.0
   - mapclassify
   - networkx=2.3
   - numpy=1.21
diff --git a/ci/envs/39-latest.yaml b/ci/envs/39-latest.yaml
@@ -5,7 +5,7 @@ dependencies:
   - python=3.9
   - geopandas
   - inequality
-  - libpysal
+  - libpysal>=4.6.0
   - mapclassify
   - networkx
   - osmnx
diff --git a/docs/install.rst b/docs/install.rst
@@ -109,7 +109,7 @@ Dependencies
 Required dependencies:
 
 - `geopandas`_ (>= 0.8.0)
-- `libpysal`_ (>= 4.1.0)
+- `libpysal`_ (>= 4.6.0)
 - `networkx`_
 - `tqdm`_
 - `pygeos`_
diff --git a/environment.yml b/environment.yml
@@ -6,7 +6,7 @@ dependencies:
   - geopandas
   - inequality
   - jupyter
-  - libpysal
+  - libpysal>=4.6.0
   - mapclassify
   - matplotlib
   - momepy
diff --git a/momepy/coins.py b/momepy/coins.py
@@ -68,7 +68,7 @@ def __init__(self, edge_gdf, angle_threshold=0):
         self.uv_index = range(len(self.edge_gdf.index))
 
         # get line segments from edge gdf
-        self.lines = [list(value[1].coords) for value in edge_gdf.geometry.iteritems()]
+        self.lines = [list(value[1].coords) for value in edge_gdf.geometry.items()]
 
         # split edges into line segments
         self._split_lines()
diff --git a/momepy/distribution.py b/momepy/distribution.py
@@ -471,7 +471,7 @@ def __init__(self, gdf, spatial_weights, unique_id, orientations, verbose=True):
 
         # iterating over rows one by one
         for index, orient in tqdm(
-            data.iteritems(), total=data.shape[0], disable=not verbose
+            data.items(), total=data.shape[0], disable=not verbose
         ):
             if index in spatial_weights.neighbors.keys():
                 neighbours = spatial_weights.neighbors[index]
@@ -538,9 +538,7 @@ def __init__(self, gdf, spatial_weights, unique_id, verbose=True):
         data = gdf.set_index(unique_id).geometry
 
         # iterating over rows one by one
-        for index, geom in tqdm(
-            data.iteritems(), total=data.shape[0], disable=not verbose
-        ):
+        for index, geom in tqdm(data.items(), total=data.shape[0], disable=not verbose):
             if geom is not None and index in spatial_weights.neighbors.keys():
                 neighbours = spatial_weights.neighbors[index]
                 building_neighbours = data.loc[neighbours]
@@ -626,7 +624,7 @@ def __init__(
         results_list = []
 
         # define adjacency list from lipysal
-        adj_list = spatial_weights.to_adjlist()
+        adj_list = spatial_weights.to_adjlist(drop_islands=True)
         adj_list["weight"] = (
             data.loc[adj_list.focal]
             .reset_index(drop=True)
@@ -876,7 +874,7 @@ def __init__(self, gdf, spatial_weights, unique_id, weighted=False, verbose=True
 
         neighbours = []
         for index, geom in tqdm(
-            gdf.set_index(unique_id).geometry.iteritems(),
+            gdf.set_index(unique_id).geometry.items(),
             total=gdf.shape[0],
             disable=not verbose,
         ):
diff --git a/momepy/diversity.py b/momepy/diversity.py
@@ -868,7 +868,7 @@ def __init__(
             data.geometry = data.centroid
 
             for i, geom in tqdm(
-                data.geometry.iteritems(), total=data.shape[0], disable=not verbose
+                data.geometry.items(), total=data.shape[0], disable=not verbose
             ):
                 if i in spatial_weights.neighbors.keys():
                     neighbours = spatial_weights.neighbors[i]
diff --git a/momepy/elements.py b/momepy/elements.py
@@ -923,7 +923,7 @@ def get_network_ratio(df, edges, initial_buffer=500):
     for name, group in grouped:
         ratios = group / totals.loc[name]
         ints_vect.append(
-            {edg_ix[touching][item[0]]: item[1] for item in ratios.iteritems()}
+            {edg_ix[touching][item[0]]: item[1] for item in ratios.items()}
         )
 
     ratios = pd.Series(ints_vect, index=df.index[list(grouped.groups.keys())])
diff --git a/momepy/intensity.py b/momepy/intensity.py
@@ -459,7 +459,7 @@ def __init__(
 
         # iterating over rows one by one
         for index, lid in tqdm(
-            left[left_id].iteritems(), total=left.shape[0], disable=not verbose
+            left[left_id].items(), total=left.shape[0], disable=not verbose
         ):
             if spatial_weights is None:
                 ids = [lid]
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 geopandas>=0.8.0
-libpysal>=4.1.0
+libpysal>=4.6.0
 networkx>=2.3
 packaging
 pandas!=1.5.0
diff --git a/tests/test_elements.py b/tests/test_elements.py
@@ -223,7 +223,7 @@ def test_get_network_ratio(self):
 
         assert links.edgeID_values.apply(lambda x: sum(x)).sum() == len(enclosed_tess)
         m = enclosed_tess["uID"] == 110
-        assert sorted(links[m].iloc[0]["edgeID_keys"]) == [0, 34]
+        assert sorted(links.loc[m].iloc[0]["edgeID_keys"]) == [0, 34]
 
         # ensure index is preserved
         enclosed_tess.index = [str(uuid.uuid4()) for _ in range(len(enclosed_tess))]

Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,7 @@ def get_network_ratio(df, edges, initial_buffer=500):`
`923`	`923`	`for name, group in grouped:`
`924`	`924`	`ratios = group / totals.loc[name]`
`925`	`925`	`ints_vect.append(`
`926`		`- {edg_ix[touching][item[0]]: item[1] for item in ratios.iteritems()}`
	`926`	`+ {edg_ix[touching][item[0]]: item[1] for item in ratios.items()}`
`927`	`927`	`)`
`928`	`928`
`929`	`929`	`ratios = pd.Series(ints_vect, index=df.index[list(grouped.groups.keys())])`