From c595e7d748dac466c1b19a0fc7623dbfa0f5a3a8 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Thu, 1 Feb 2024 08:37:24 -0800 Subject: [PATCH 1/3] add dependabot and update pre-commit --- .github/dependabot.yml | 6 ++++++ .pre-commit-config.yaml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..5ace460 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e8e9a4f..dd3a068 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,13 +16,13 @@ repos: - id: trailing-whitespace - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.3" + rev: "v3.1.0" hooks: - id: prettier types_or: [markdown, yaml] - repo: https://github.com/nbQA-dev/nbQA - rev: "1.7.0" + rev: "1.7.1" hooks: - id: nbqa-isort additional_dependencies: [isort] From 3f8454633000efdc90f696fa7f9ff4fb04fbe122 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Thu, 1 Feb 2024 08:37:34 -0800 Subject: [PATCH 2/3] updates for v1.9 --- environment.yml | 4 ++-- notebooks/01-overview-osmnx.ipynb | 2 +- notebooks/04-simplify-graph-consolidate-nodes.ipynb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/environment.yml b/environment.yml index 31fe2b7..6e33aeb 100644 --- a/environment.yml +++ b/environment.yml @@ -3,8 +3,8 @@ channels: - conda-forge dependencies: - jupyterlab - - osmnx=1.8.1 + - osmnx=1.9.0 - pillow - pre-commit - - python=3.11.* + - python=3.12.* - python-igraph diff --git a/notebooks/01-overview-osmnx.ipynb b/notebooks/01-overview-osmnx.ipynb index 5cb03e5..f37ffeb 100644 --- a/notebooks/01-overview-osmnx.ipynb +++ b/notebooks/01-overview-osmnx.ipynb @@ -345,7 +345,7 @@ "outputs": [], "source": [ "# turn off strict mode and see what nodes we'd remove, in yellow\n", - "nc = [\"r\" if ox.simplification._is_endpoint(G, node) else \"y\" for node in G.nodes()]\n", + "nc = [\"r\" if ox.simplification._is_endpoint(G, node, None) else \"y\" for node in G.nodes()]\n", "fig, ax = ox.plot_graph(G, node_color=nc)" ] }, diff --git a/notebooks/04-simplify-graph-consolidate-nodes.ipynb b/notebooks/04-simplify-graph-consolidate-nodes.ipynb index bcf9636..ef652f6 100644 --- a/notebooks/04-simplify-graph-consolidate-nodes.ipynb +++ b/notebooks/04-simplify-graph-consolidate-nodes.ipynb @@ -150,7 +150,7 @@ "outputs": [], "source": [ "# show which nodes we'd remove if we simplify it (yellow)\n", - "nc = [\"r\" if ox.simplification._is_endpoint(G, node) else \"y\" for node in G.nodes()]\n", + "nc = [\"r\" if ox.simplification._is_endpoint(G, node, None) else \"y\" for node in G.nodes()]\n", "fig, ax = ox.plot_graph(G, node_color=nc)" ] }, @@ -183,7 +183,7 @@ "outputs": [], "source": [ "# turn off strict mode and see what nodes we'd remove\n", - "nc = [\"r\" if ox.simplification._is_endpoint(G, node, strict=False) else \"y\" for node in G.nodes()]\n", + "nc = [\"r\" if ox.simplification._is_endpoint(G, node, [\"osmid\"]) else \"y\" for node in G.nodes()]\n", "fig, ax = ox.plot_graph(G, node_color=nc)" ] }, From 22486d0e84cdac2d8b7a137f76a7b8f3910ac766 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Thu, 1 Feb 2024 08:51:26 -0800 Subject: [PATCH 3/3] use python 3.11 --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 6e33aeb..0da6d16 100644 --- a/environment.yml +++ b/environment.yml @@ -6,5 +6,5 @@ dependencies: - osmnx=1.9.0 - pillow - pre-commit - - python=3.12.* + - python=3.11.* - python-igraph