Merge pull request #1195 from gboeing/fix

pre-commit versions, dep versions, update changelog

.pre-commit-config.yaml

@@ -35,14 +35,14 @@ repos:
         args: [--disable=MD013]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.5.0"
+    rev: "v0.5.4"
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.10.1"
+    rev: "v1.11.0"
     hooks:
       - id: mypy
         additional_dependencies:

CHANGELOG.md

@@ -8,6 +8,7 @@ Read the v2 [migration guide](https://github.com/gboeing/osmnx/issues/1123)
 - remove all functionality previously deprecated in v1 (#1113 #1122 #1135 #1148)
 - drop Python 3.8 support (#1106)
 - bump minimum required numpy version to 1.21 for typing support (#1133)
+- bump minimum required geopandas version to 1.0 for union_all support (#1179)
 - improve docstrings throughout package (#1116)
 - improve logging and warnings throughout package (#1125)
 - improve error messages throughout package (#1131)

environments/tests/env-test-minimal.yml

@@ -8,7 +8,7 @@ channels:
 
 dependencies:
   # requirements (pinned to min versions from /pyproject.toml)
-  - geopandas=0.12
+  - geopandas=1.0
   - networkx=2.5
   - numpy=1.21
   - pandas=1.1

osmnx/utils.py

@@ -151,8 +151,8 @@ def log(
             # print explicitly to terminal in case Jupyter has captured stdout
             if getattr(sys.stdout, "_original_stdstream_copy", None) is not None:
                 # redirect the Jupyter-captured pipe back to original
-                os.dup2(sys.stdout._original_stdstream_copy, sys.__stdout__.fileno())  # type: ignore[attr-defined]
-                sys.stdout._original_stdstream_copy = None  # type: ignore[attr-defined]
+                os.dup2(sys.stdout._original_stdstream_copy, sys.__stdout__.fileno())  # type: ignore[union-attr]
+                sys.stdout._original_stdstream_copy = None  # type: ignore[union-attr]
             with redirect_stdout(sys.__stdout__):
                 print(message, file=sys.__stdout__, flush=True)
         except OSError:

pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Visualization",
 ]
 dependencies = [
-  "geopandas>=1.0.1",
+  "geopandas>=1.0",
   "networkx>=2.5",
   "numpy>=1.21",
   "pandas>=1.1",