From afe296b342cd717216272190ecb283d78e207573 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 16 Jun 2025 17:37:15 -0700 Subject: [PATCH 01/14] move optional extras required to run examples into osmnx's pyproject.toml --- notebooks/00-osmnx-features-demo.ipynb | 2 +- pyproject.toml | 28 ++++++-------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/notebooks/00-osmnx-features-demo.ipynb b/notebooks/00-osmnx-features-demo.ipynb index 268a38d..84c7bb4 100644 --- a/notebooks/00-osmnx-features-demo.ipynb +++ b/notebooks/00-osmnx-features-demo.ipynb @@ -34,7 +34,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!wget -q https://raw.githubusercontent.com/gboeing/osmnx-examples/refs/heads/main/pyproject.toml && uv sync -q\n", "import networkx as nx\n", "import osmnx as ox\n", "\n", diff --git a/pyproject.toml b/pyproject.toml index 44aa563..188d5ab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,32 +1,16 @@ [project] authors = [{ name = "Geoff Boeing", email = "boeing@usc.edu" }] -dependencies = [ - "folium", - "geopandas", - "jupyterlab", - "mapclassify", - "matplotlib", - "nbdime", - "networkx", - "numpy", - "osmnx==2.0.4", - "pandas", - "pre-commit", - "python-igraph", - "rasterio", - "requests", - "rio-vrt", - "scikit-learn", - "scipy", - "shapely", -] -description = "Gallery of OSMnx tutorials, usage examples, and feature demonstations." +dependencies = ["osmnx[entropy,examples,neighbors,raster,visualization]==2.0.4"] +description = "Gallery of OSMnx tutorials, usage examples, and feature demonstrations." license = "MIT" license-files = ["LICENSE.txt"] name = "osmnx-examples" readme = "README.md" requires-python = ">=3.9" -version = "2.0.4" +version = "2.0.4" # match pinned version above + +[dependency-groups] +dev = ["jupyterlab", "nbdime", "pre-commit"] [tool.ruff] cache-dir = "~/.cache/pre-commit/ruff" From 7467a995fd7cd078fe52852d2329dee872c3a85a Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Tue, 17 Jun 2025 13:25:48 -0700 Subject: [PATCH 02/14] add external dependencies --- pyproject.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 188d5ab..c893e42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,11 @@ [project] authors = [{ name = "Geoff Boeing", email = "boeing@usc.edu" }] -dependencies = ["osmnx[entropy,examples,neighbors,raster,visualization]==2.0.4"] +dependencies = [ + "folium", + "mapclassify", + "osmnx[entropy,neighbors,raster,visualization]==2.0.4", + "python-igraph" +] description = "Gallery of OSMnx tutorials, usage examples, and feature demonstrations." license = "MIT" license-files = ["LICENSE.txt"] From 9c4395efa6b054851fc6b45bb61858ff35d2a289 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Tue, 17 Jun 2025 13:42:44 -0700 Subject: [PATCH 03/14] add install cell --- notebooks/00-osmnx-features-demo.ipynb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/notebooks/00-osmnx-features-demo.ipynb b/notebooks/00-osmnx-features-demo.ipynb index 84c7bb4..13f8bb9 100644 --- a/notebooks/00-osmnx-features-demo.ipynb +++ b/notebooks/00-osmnx-features-demo.ipynb @@ -34,7 +34,17 @@ "metadata": {}, "outputs": [], "source": [ - "#!wget -q https://raw.githubusercontent.com/gboeing/osmnx-examples/refs/heads/main/pyproject.toml && uv sync -q\n", + "# if you're using colab, install the dependencies by uncommenting the following lines\n", + "#!wget -q https://raw.githubusercontent.com/gboeing/osmnx-examples/refs/heads/main/pyproject.toml\n", + "#!uv sync -q" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ "import networkx as nx\n", "import osmnx as ox\n", "\n", From 11d9251d1a79592e5b1f8572dd6e66b1a5a63fac Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Tue, 17 Jun 2025 14:38:24 -0700 Subject: [PATCH 04/14] uv install dependencies --- notebooks/00-osmnx-features-demo.ipynb | 5 ++--- notebooks/11-interactive-web-mapping.ipynb | 2 +- notebooks/14-osmnx-to-igraph.ipynb | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/notebooks/00-osmnx-features-demo.ipynb b/notebooks/00-osmnx-features-demo.ipynb index 13f8bb9..45cd355 100644 --- a/notebooks/00-osmnx-features-demo.ipynb +++ b/notebooks/00-osmnx-features-demo.ipynb @@ -34,9 +34,8 @@ "metadata": {}, "outputs": [], "source": [ - "# if you're using colab, install the dependencies by uncommenting the following lines\n", - "#!wget -q https://raw.githubusercontent.com/gboeing/osmnx-examples/refs/heads/main/pyproject.toml\n", - "#!uv sync -q" + "# if you're using colab, install dependencies by running the following line\n", + "#!uv pip install --system --quiet osmnx" ] }, { diff --git a/notebooks/11-interactive-web-mapping.ipynb b/notebooks/11-interactive-web-mapping.ipynb index ad061b8..bbf89d0 100644 --- a/notebooks/11-interactive-web-mapping.ipynb +++ b/notebooks/11-interactive-web-mapping.ipynb @@ -24,7 +24,7 @@ }, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet folium mapclassify osmnx\n", "import networkx as nx\n", "import osmnx as ox\n", "\n", diff --git a/notebooks/14-osmnx-to-igraph.ipynb b/notebooks/14-osmnx-to-igraph.ipynb index 9b41594..e3d8419 100644 --- a/notebooks/14-osmnx-to-igraph.ipynb +++ b/notebooks/14-osmnx-to-igraph.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet igraph osmnx\n", + "#!uv pip install --system --quiet python-igraph osmnx\n", "import operator\n", "\n", "import igraph as ig\n", From bb8945341b4ca939412b21d26030231c2ce4986b Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Tue, 17 Jun 2025 14:52:33 -0700 Subject: [PATCH 05/14] update dependencies --- notebooks/14-osmnx-to-igraph.ipynb | 2 +- pyproject.toml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/notebooks/14-osmnx-to-igraph.ipynb b/notebooks/14-osmnx-to-igraph.ipynb index e3d8419..9b41594 100644 --- a/notebooks/14-osmnx-to-igraph.ipynb +++ b/notebooks/14-osmnx-to-igraph.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet python-igraph osmnx\n", + "#!uv pip install --system --quiet igraph osmnx\n", "import operator\n", "\n", "import igraph as ig\n", diff --git a/pyproject.toml b/pyproject.toml index c893e42..3397020 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,9 +2,10 @@ authors = [{ name = "Geoff Boeing", email = "boeing@usc.edu" }] dependencies = [ "folium", + "igraph", + "jupyterlab", "mapclassify", "osmnx[entropy,neighbors,raster,visualization]==2.0.4", - "python-igraph" ] description = "Gallery of OSMnx tutorials, usage examples, and feature demonstrations." license = "MIT" @@ -15,7 +16,7 @@ requires-python = ">=3.9" version = "2.0.4" # match pinned version above [dependency-groups] -dev = ["jupyterlab", "nbdime", "pre-commit"] +dev = ["nbdime", "pre-commit"] [tool.ruff] cache-dir = "~/.cache/pre-commit/ruff" From 8030e566024409d80ecea2007cc8a24de9499f5e Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Tue, 17 Jun 2025 17:12:29 -0700 Subject: [PATCH 06/14] move examples requirements to osmnx[all] --- notebooks/00-osmnx-features-demo.ipynb | 2 +- notebooks/01-overview-osmnx.ipynb | 2 +- notebooks/02-routing-speed-time.ipynb | 2 +- notebooks/03-graph-place-queries.ipynb | 2 +- notebooks/04-simplify-graph-consolidate-nodes.ipynb | 2 +- notebooks/05-save-load-networks.ipynb | 2 +- notebooks/06-stats-indicators-centrality.ipynb | 2 +- notebooks/07-plot-graph-over-shape.ipynb | 2 +- notebooks/08-custom-filters-infrastructure.ipynb | 2 +- notebooks/09-example-figure-ground.ipynb | 2 +- notebooks/10-building-footprints.ipynb | 2 +- notebooks/11-interactive-web-mapping.ipynb | 2 +- notebooks/12-node-elevations-edge-grades.ipynb | 2 +- notebooks/13-isolines-isochrones.ipynb | 2 +- notebooks/14-osmnx-to-igraph.ipynb | 2 +- notebooks/15-advanced-plotting.ipynb | 2 +- notebooks/16-download-osm-geospatial-features.ipynb | 2 +- notebooks/17-street-network-orientations.ipynb | 2 +- notebooks/18-network-constrained-clustering.ipynb | 2 +- pyproject.toml | 8 +------- 20 files changed, 20 insertions(+), 26 deletions(-) diff --git a/notebooks/00-osmnx-features-demo.ipynb b/notebooks/00-osmnx-features-demo.ipynb index 45cd355..d74d69b 100644 --- a/notebooks/00-osmnx-features-demo.ipynb +++ b/notebooks/00-osmnx-features-demo.ipynb @@ -35,7 +35,7 @@ "outputs": [], "source": [ "# if you're using colab, install dependencies by running the following line\n", - "#!uv pip install --system --quiet osmnx" + "#!uv pip install --system --quiet osmnx[all]" ] }, { diff --git a/notebooks/01-overview-osmnx.ipynb b/notebooks/01-overview-osmnx.ipynb index 04f7688..1a7e69e 100644 --- a/notebooks/01-overview-osmnx.ipynb +++ b/notebooks/01-overview-osmnx.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "from pathlib import Path\n", "\n", "import geopandas as gpd\n", diff --git a/notebooks/02-routing-speed-time.ipynb b/notebooks/02-routing-speed-time.ipynb index e12ab8b..d30aba4 100644 --- a/notebooks/02-routing-speed-time.ipynb +++ b/notebooks/02-routing-speed-time.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import multiprocessing as mp\n", "\n", "import numpy as np\n", diff --git a/notebooks/03-graph-place-queries.ipynb b/notebooks/03-graph-place-queries.ipynb index a8bb91e..5019d2c 100644 --- a/notebooks/03-graph-place-queries.ipynb +++ b/notebooks/03-graph-place-queries.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import osmnx as ox\n", "\n", "ox.__version__" diff --git a/notebooks/04-simplify-graph-consolidate-nodes.ipynb b/notebooks/04-simplify-graph-consolidate-nodes.ipynb index 4559d99..29b92cf 100644 --- a/notebooks/04-simplify-graph-consolidate-nodes.ipynb +++ b/notebooks/04-simplify-graph-consolidate-nodes.ipynb @@ -20,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import networkx as nx\n", "import osmnx as ox\n", "\n", diff --git a/notebooks/05-save-load-networks.ipynb b/notebooks/05-save-load-networks.ipynb index e202c78..0678cfe 100644 --- a/notebooks/05-save-load-networks.ipynb +++ b/notebooks/05-save-load-networks.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "from pathlib import Path\n", "\n", "import osmnx as ox\n", diff --git a/notebooks/06-stats-indicators-centrality.ipynb b/notebooks/06-stats-indicators-centrality.ipynb index 682a011..e750ed7 100644 --- a/notebooks/06-stats-indicators-centrality.ipynb +++ b/notebooks/06-stats-indicators-centrality.ipynb @@ -20,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import networkx as nx\n", "import osmnx as ox\n", "import pandas as pd\n", diff --git a/notebooks/07-plot-graph-over-shape.ipynb b/notebooks/07-plot-graph-over-shape.ipynb index 7fae0c4..dd59163 100644 --- a/notebooks/07-plot-graph-over-shape.ipynb +++ b/notebooks/07-plot-graph-over-shape.ipynb @@ -20,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet matplotlib osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import geopandas as gpd\n", "import matplotlib.pyplot as plt\n", "import osmnx as ox\n", diff --git a/notebooks/08-custom-filters-infrastructure.ipynb b/notebooks/08-custom-filters-infrastructure.ipynb index 717b3d9..41cf4f9 100644 --- a/notebooks/08-custom-filters-infrastructure.ipynb +++ b/notebooks/08-custom-filters-infrastructure.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import osmnx as ox\n", "\n", "ox.settings.log_console = True\n", diff --git a/notebooks/09-example-figure-ground.ipynb b/notebooks/09-example-figure-ground.ipynb index fee70d0..4379502 100644 --- a/notebooks/09-example-figure-ground.ipynb +++ b/notebooks/09-example-figure-ground.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet ipython osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import osmnx as ox\n", "from IPython.display import Image\n", "\n", diff --git a/notebooks/10-building-footprints.ipynb b/notebooks/10-building-footprints.ipynb index 47afacb..9d064ad 100644 --- a/notebooks/10-building-footprints.ipynb +++ b/notebooks/10-building-footprints.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet ipython osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "from pathlib import Path\n", "\n", "import osmnx as ox\n", diff --git a/notebooks/11-interactive-web-mapping.ipynb b/notebooks/11-interactive-web-mapping.ipynb index bbf89d0..0e73a44 100644 --- a/notebooks/11-interactive-web-mapping.ipynb +++ b/notebooks/11-interactive-web-mapping.ipynb @@ -24,7 +24,7 @@ }, "outputs": [], "source": [ - "#!uv pip install --system --quiet folium mapclassify osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import networkx as nx\n", "import osmnx as ox\n", "\n", diff --git a/notebooks/12-node-elevations-edge-grades.ipynb b/notebooks/12-node-elevations-edge-grades.ipynb index 4e60eed..791f921 100644 --- a/notebooks/12-node-elevations-edge-grades.ipynb +++ b/notebooks/12-node-elevations-edge-grades.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import sys\n", "\n", "import numpy as np\n", diff --git a/notebooks/13-isolines-isochrones.ipynb b/notebooks/13-isolines-isochrones.ipynb index dedcd68..04bb4f7 100644 --- a/notebooks/13-isolines-isochrones.ipynb +++ b/notebooks/13-isolines-isochrones.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet matplotlib osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import geopandas as gpd\n", "import matplotlib.pyplot as plt\n", "import networkx as nx\n", diff --git a/notebooks/14-osmnx-to-igraph.ipynb b/notebooks/14-osmnx-to-igraph.ipynb index 9b41594..52adbb1 100644 --- a/notebooks/14-osmnx-to-igraph.ipynb +++ b/notebooks/14-osmnx-to-igraph.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet igraph osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import operator\n", "\n", "import igraph as ig\n", diff --git a/notebooks/15-advanced-plotting.ipynb b/notebooks/15-advanced-plotting.ipynb index fcdf0f0..2211d99 100644 --- a/notebooks/15-advanced-plotting.ipynb +++ b/notebooks/15-advanced-plotting.ipynb @@ -20,7 +20,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet matplotlib osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import matplotlib.pyplot as plt\n", "import osmnx as ox\n", "\n", diff --git a/notebooks/16-download-osm-geospatial-features.ipynb b/notebooks/16-download-osm-geospatial-features.ipynb index c8545e4..7c0a867 100644 --- a/notebooks/16-download-osm-geospatial-features.ipynb +++ b/notebooks/16-download-osm-geospatial-features.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import osmnx as ox\n", "import pandas as pd\n", "\n", diff --git a/notebooks/17-street-network-orientations.ipynb b/notebooks/17-street-network-orientations.ipynb index b4308ee..148616d 100644 --- a/notebooks/17-street-network-orientations.ipynb +++ b/notebooks/17-street-network-orientations.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet matplotlib osmnx\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import matplotlib.pyplot as plt\n", "import numpy as np\n", "import osmnx as ox\n", diff --git a/notebooks/18-network-constrained-clustering.ipynb b/notebooks/18-network-constrained-clustering.ipynb index a299c3e..09370cc 100644 --- a/notebooks/18-network-constrained-clustering.ipynb +++ b/notebooks/18-network-constrained-clustering.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx scikit-learn scipy\n", + "#!uv pip install --system --quiet osmnx[all]\n", "import networkx as nx\n", "import numpy as np\n", "import osmnx as ox\n", diff --git a/pyproject.toml b/pyproject.toml index 3397020..8810ca2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,6 @@ [project] authors = [{ name = "Geoff Boeing", email = "boeing@usc.edu" }] -dependencies = [ - "folium", - "igraph", - "jupyterlab", - "mapclassify", - "osmnx[entropy,neighbors,raster,visualization]==2.0.4", -] +dependencies = ["osmnx[all]==2.0.4"] description = "Gallery of OSMnx tutorials, usage examples, and feature demonstrations." license = "MIT" license-files = ["LICENSE.txt"] From 2b2cfade35aedf007ad1733cf1377d4e2f71f985 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Tue, 17 Jun 2025 21:32:24 -0700 Subject: [PATCH 07/14] version bump to 2.0.5 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8810ca2..4acd380 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,13 @@ [project] authors = [{ name = "Geoff Boeing", email = "boeing@usc.edu" }] -dependencies = ["osmnx[all]==2.0.4"] +dependencies = ["osmnx[all]==2.0.5"] description = "Gallery of OSMnx tutorials, usage examples, and feature demonstrations." license = "MIT" license-files = ["LICENSE.txt"] name = "osmnx-examples" readme = "README.md" requires-python = ">=3.9" -version = "2.0.4" # match pinned version above +version = "2.0.5" # match pinned version above [dependency-groups] dev = ["nbdime", "pre-commit"] From 0bbc92c6aac1753fd0e0a67e6c1b1d21f48e43e7 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Tue, 17 Jun 2025 22:14:03 -0700 Subject: [PATCH 08/14] temporarily provide dependencies manually until 2.0.5 is released --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4acd380..3278ee4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] authors = [{ name = "Geoff Boeing", email = "boeing@usc.edu" }] -dependencies = ["osmnx[all]==2.0.5"] +dependencies = ["osmnx[entropy,neighbors,raster,visualization]==2.0.4", "jupyterlab", "folium", "igraph", "mapclassify"] description = "Gallery of OSMnx tutorials, usage examples, and feature demonstrations." license = "MIT" license-files = ["LICENSE.txt"] From 34b32679a7c1c348cd8a1c617c1658862b3ee9c5 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 23 Jun 2025 12:45:24 -0700 Subject: [PATCH 09/14] move notebook dependencies to dependency-groups --- .github/workflows/tests.yml | 2 +- notebooks/11-interactive-web-mapping.ipynb | 2 +- notebooks/14-osmnx-to-igraph.ipynb | 2 +- pyproject.toml | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5498113..9a1251b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: - name: Install dependencies run: | - uv sync --dev + uv sync --all-groups uv pip check uv pip list uv pip show osmnx diff --git a/notebooks/11-interactive-web-mapping.ipynb b/notebooks/11-interactive-web-mapping.ipynb index 0e73a44..4433b51 100644 --- a/notebooks/11-interactive-web-mapping.ipynb +++ b/notebooks/11-interactive-web-mapping.ipynb @@ -24,7 +24,7 @@ }, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx[all]\n", + "#!uv pip install --system --quiet osmnx[all] folium mapclassify\n", "import networkx as nx\n", "import osmnx as ox\n", "\n", diff --git a/notebooks/14-osmnx-to-igraph.ipynb b/notebooks/14-osmnx-to-igraph.ipynb index 52adbb1..46aaf2d 100644 --- a/notebooks/14-osmnx-to-igraph.ipynb +++ b/notebooks/14-osmnx-to-igraph.ipynb @@ -24,7 +24,7 @@ "metadata": {}, "outputs": [], "source": [ - "#!uv pip install --system --quiet osmnx[all]\n", + "#!uv pip install --system --quiet osmnx[all] igraph\n", "import operator\n", "\n", "import igraph as ig\n", diff --git a/pyproject.toml b/pyproject.toml index 4acd380..1e27203 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] authors = [{ name = "Geoff Boeing", email = "boeing@usc.edu" }] -dependencies = ["osmnx[all]==2.0.5"] +dependencies = ["osmnx[entropy,neighbors,raster,visualization]==2.0.4"] description = "Gallery of OSMnx tutorials, usage examples, and feature demonstrations." license = "MIT" license-files = ["LICENSE.txt"] @@ -11,6 +11,7 @@ version = "2.0.5" # match pinned version above [dependency-groups] dev = ["nbdime", "pre-commit"] +notebooks = ["folium>=0.12", "jupyterlab>=3.0", "mapclassify>=2.5", "igraph>=0.9"] [tool.ruff] cache-dir = "~/.cache/pre-commit/ruff" From 2cf602114e9174bd5fa7bb63ae69ecad0fee205d Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 23 Jun 2025 13:01:45 -0700 Subject: [PATCH 10/14] move notebooks dependency group to optional dependencies --- .github/workflows/tests.yml | 2 +- pyproject.toml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9a1251b..5face53 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: - name: Install dependencies run: | - uv sync --all-groups + uv sync --all-extras --all-groups uv pip check uv pip list uv pip show osmnx diff --git a/pyproject.toml b/pyproject.toml index 996808e..c6858a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,9 +9,11 @@ readme = "README.md" requires-python = ">=3.9" version = "2.0.5" # match pinned version above +[project.optional-dependencies] +all = ["folium", "jupyterlab", "mapclassify", "igraph"] + [dependency-groups] dev = ["nbdime", "pre-commit"] -notebooks = ["folium", "jupyterlab", "mapclassify", "igraph"] [tool.ruff] cache-dir = "~/.cache/pre-commit/ruff" From 4df75eca60f3918c2463b4f6a6d1ef1748c8bb23 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 23 Jun 2025 15:44:48 -0700 Subject: [PATCH 11/14] comment clarity --- notebooks/00-osmnx-features-demo.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebooks/00-osmnx-features-demo.ipynb b/notebooks/00-osmnx-features-demo.ipynb index d74d69b..da8faa9 100644 --- a/notebooks/00-osmnx-features-demo.ipynb +++ b/notebooks/00-osmnx-features-demo.ipynb @@ -34,7 +34,7 @@ "metadata": {}, "outputs": [], "source": [ - "# if you're using colab, install dependencies by running the following line\n", + "# if using colab, install dependencies by un-commenting the line below\n", "#!uv pip install --system --quiet osmnx[all]" ] }, From c8e46a4af4e6ac23dabb0ce67135017a2828cd56 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 23 Jun 2025 15:45:01 -0700 Subject: [PATCH 12/14] replace uv pip check, list, show with --verbose --- .github/workflows/tests.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5face53..8c8b550 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,12 +33,7 @@ jobs: enable-cache: true - name: Install dependencies - run: | - uv sync --all-extras --all-groups - uv pip check - uv pip list - uv pip show osmnx - uv run python --version + run: uv sync --all-extras --all-groups --verbose - name: Cache pre-commit uses: actions/cache@v4 From e61aa9dc694bbc3d95cccfc7d9a8c3909dbff178 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 23 Jun 2025 15:59:24 -0700 Subject: [PATCH 13/14] remove verbose --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8c8b550..dc842bf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,7 @@ jobs: enable-cache: true - name: Install dependencies - run: uv sync --all-extras --all-groups --verbose + run: uv sync --all-extras --all-groups - name: Cache pre-commit uses: actions/cache@v4 From 7e894cfdf69ebb46cdda24794b0e2ce3c2daf24c Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Sat, 5 Jul 2025 09:53:59 -0700 Subject: [PATCH 14/14] use v2.0.5 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c6858a3..ee2fc4b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] authors = [{ name = "Geoff Boeing", email = "boeing@usc.edu" }] -dependencies = ["osmnx[entropy,neighbors,raster,visualization]==2.0.4"] +dependencies = ["osmnx[all]==2.0.5"] description = "Gallery of OSMnx tutorials, usage examples, and feature demonstrations." license = "MIT" license-files = ["LICENSE.txt"]