From 67782887084a01258a548f68336ad08c6c4188af Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Sat, 20 Jul 2024 12:07:04 -0700 Subject: [PATCH 1/3] bump precommit --- .pre-commit-config.yaml | 4 ++-- osmnx/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7f68752e6..2a5642aef 100644 --- a/.pre-commit-config.yaml +++ b/.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: diff --git a/osmnx/utils.py b/osmnx/utils.py index b982866a2..2e4a5a8ff 100644 --- a/osmnx/utils.py +++ b/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: From 94be8c3aaa14cfd3c0f210bdf1a6f992c13a0489 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Sat, 20 Jul 2024 12:07:17 -0700 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1721043b8..54d0a0b95 100644 --- a/CHANGELOG.md +++ b/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) From 331f77bb6b9964afb8f772cdb07ace19ab3ffbf8 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Sat, 20 Jul 2024 12:07:38 -0700 Subject: [PATCH 3/3] require geopandas >1.0 --- environments/tests/env-test-minimal.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/tests/env-test-minimal.yml b/environments/tests/env-test-minimal.yml index 1ea8ff9af..cbd92b13b 100644 --- a/environments/tests/env-test-minimal.yml +++ b/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 diff --git a/pyproject.toml b/pyproject.toml index ced0466a4..d03491c9a 100644 --- a/pyproject.toml +++ b/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",