r5py 1.0.0.dev0__tar.gz → 1.0.0.dev3__tar.gz

{r5py-1.0.0.dev0/src/r5py.egg-info → r5py-1.0.0.dev3}/PKG-INFO

@@ -1,9 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: r5py
-Version: 1.0.0.dev0
+Version: 1.0.0.dev3
 Summary: Python wrapper for the R5 routing analysis engine
-Author: Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
-Author-email: Christoph Fink <christoph.fink@helsinki.fi>
+Author: Christoph Fink, Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
 License: GPL-3.0-or-later or MIT
 Project-URL: Documentation, https://r5py.readthedocs.org/
 Project-URL: Repository, https://github.com/r5py/r5py.git
@@ -21,7 +20,6 @@ Requires-Dist: ConfigArgParse
 Requires-Dist: filelock
 Requires-Dist: fiona
 Requires-Dist: geopandas
-Requires-Dist: importlib_resources
 Requires-Dist: joblib
 Requires-Dist: jpype1
 Requires-Dist: numpy
@@ -52,7 +50,6 @@ Requires-Dist: sphinxcontrib-images; extra == "docs"
 Provides-Extra: tests
 Requires-Dist: pyarrow; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
-Requires-Dist: pytest-asyncio; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-lazy-fixtures; extra == "tests"
 Requires-Dist: r5py.sampledata.helsinki>=0.1.1; extra == "tests"

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3}/pyproject.toml

@@ -8,7 +8,7 @@ description = "Python wrapper for the R5 routing analysis engine"
 readme = "README.md"
 
 authors = [
-    { name = "Christoph Fink", email = "christoph.fink@helsinki.fi" },
+    { name = "Christoph Fink" },
     { name = "Willem Klumpenhouwer" },
     { name = "Marcus Sairava" },
     { name = "Rafael Pereira" },
@@ -20,7 +20,6 @@ dependencies = [
     "filelock",
     "fiona",
     "geopandas",
-    "importlib_resources",
     "joblib",
     "jpype1",
     "numpy",
@@ -49,9 +48,9 @@ docs = ["contextily", "folium", "GitPython", "h3>=4.0.0b2", "jupyterlab_myst",
         "r5py.sampledata.helsinki>=0.1.1", "r5py.sampledata.sao_paulo>=0.1.1",
         "shapely", "sphinx", "sphinx-book-theme", "sphinx-design",
         "sphinxcontrib-bibtex", "sphinxcontrib-images"]
-tests = ["pyarrow", "pytest", "pytest-asyncio", "pytest-cov",
-         "pytest-lazy-fixtures", "r5py.sampledata.helsinki>=0.1.1",
-         "r5py.sampledata.sao_paulo>=0.1.1", "typing-extensions"]
+tests = ["pyarrow", "pytest", "pytest-cov", "pytest-lazy-fixtures",
+         "r5py.sampledata.helsinki>=0.1.1", "r5py.sampledata.sao_paulo>=0.1.1",
+         "typing-extensions"]
 
 
 [project.urls]
@@ -81,7 +80,6 @@ filterwarnings = [
     "ignore:Successfully downloaded r5-"
 ]
 testpaths = ["tests"]
-asyncio_mode = "auto"
 
 [tool.setuptools.dynamic]
 version = {attr = "r5py.__version__"}

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3}/src/r5py/__init__.py

@@ -2,7 +2,7 @@
 
 """Python wrapper for the R5 routing analysis engine."""
 
-__version__ = "1.0.0dev0"
+__version__ = "1.0.0.dev3"
 
 
 from .r5 import (

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3}/src/r5py/r5/travel_time_matrix.py

@@ -134,17 +134,16 @@ class TravelTimeMatrix(BaseTravelTimeMatrix):
             travel time.
         """
         # First, create an empty DataFrame (this forces column types)
-        travel_time_columns = {
-            "from_id": pandas.Series(dtype=str),
-            "to_id": pandas.Series(dtype=str),
-        }
-        travel_time_columns.update(
+        od_matrix = pandas.DataFrame(
             {
+                "from_id": pandas.Series(dtype=str),
+                "to_id": pandas.Series(dtype=str),
+            }
+            | {
                 f"travel_time_p{percentile:d}": pandas.Series(dtype=float)
                 for percentile in self.request.percentiles
             }
         )
-        od_matrix = pandas.DataFrame(travel_time_columns)
 
         # first assign columns with correct length (`to_id`),
         # only then fill `from_id` (it’s a scalar)

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3}/src/r5py/util/classpath.py

@@ -18,9 +18,9 @@ from .warnings import R5pyWarning
 
 # update these to use a newer R5 version if no R5 available locally
 R5_JAR_URL = (
-    "https://github.com/r5py/r5/releases/download/v7.2-r5py/r5-v7.2-r5py-all.jar"
+    "https://github.com/r5py/r5/releases/download/v7.3-r5py/r5-v7.3-r5py-all.jar"
 )
-R5_JAR_SHA256 = "f693af105b4b9c5fb317f0c81cf2d6d54a46b3b56a7c4817454d758920fbe706"
+R5_JAR_SHA256 = "cb1ccad370757ba229cf17f1bedc9549ff5d77fdbb44b7a3058104fe1f243f53"
 # ---
 
 

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3}/src/r5py/util/config.py

@@ -3,20 +3,20 @@
 """Handle configuration options and command line options."""
 
 import functools
+import importlib.resources
 import os
 import pathlib
 import sys
 import tempfile
 
 import configargparse
-import importlib_resources
 
 
 __all__ = ["Config"]
 
 
 PACKAGE = __package__.split(".")[0]
-CONFIG_FILE_TEMPLATE = importlib_resources.files(f"{PACKAGE}.util").joinpath(
+CONFIG_FILE_TEMPLATE = importlib.resources.files(f"{PACKAGE}.util").joinpath(
     f"{PACKAGE}.yml.template"
 )
 
@@ -116,7 +116,7 @@ class Config:
             try:
                 destination_path.parent.mkdir(parents=True, exist_ok=True)
 
-                with importlib_resources.as_file(CONFIG_FILE_TEMPLATE) as template:
+                with importlib.resources.as_file(CONFIG_FILE_TEMPLATE) as template:
                     destination_path.write_text(template.read_text())
 
             except (

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3}/src/r5py/util/sample_data_set.py

@@ -20,7 +20,10 @@ class SampleDataSet(pathlib.Path):
 
     # decide which kind of pathlib.Path we are (Windows, Unix, ...)
     # cf. https://stackoverflow.com/a/66613346/463864
-    _flavour = type(pathlib.Path())._flavour
+    try:
+        _flavour = type(pathlib.Path())._flavour
+    except AttributeError:  # Python>=3.13
+        pass
 
     _CACHE_DIR = pathlib.Path(config.CACHE_DIR) / "sampledata"
 

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3/src/r5py.egg-info}/PKG-INFO

@@ -1,9 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: r5py
-Version: 1.0.0.dev0
+Version: 1.0.0.dev3
 Summary: Python wrapper for the R5 routing analysis engine
-Author: Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
-Author-email: Christoph Fink <christoph.fink@helsinki.fi>
+Author: Christoph Fink, Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
 License: GPL-3.0-or-later or MIT
 Project-URL: Documentation, https://r5py.readthedocs.org/
 Project-URL: Repository, https://github.com/r5py/r5py.git
@@ -21,7 +20,6 @@ Requires-Dist: ConfigArgParse
 Requires-Dist: filelock
 Requires-Dist: fiona
 Requires-Dist: geopandas
-Requires-Dist: importlib_resources
 Requires-Dist: joblib
 Requires-Dist: jpype1
 Requires-Dist: numpy
@@ -52,7 +50,6 @@ Requires-Dist: sphinxcontrib-images; extra == "docs"
 Provides-Extra: tests
 Requires-Dist: pyarrow; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
-Requires-Dist: pytest-asyncio; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-lazy-fixtures; extra == "tests"
 Requires-Dist: r5py.sampledata.helsinki>=0.1.1; extra == "tests"

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3}/src/r5py.egg-info/requires.txt

@@ -2,7 +2,6 @@ ConfigArgParse
 filelock
 fiona
 geopandas
-importlib_resources
 joblib
 jpype1
 numpy
@@ -35,7 +34,6 @@ sphinxcontrib-images
 [tests]
 pyarrow
 pytest
-pytest-asyncio
 pytest-cov
 pytest-lazy-fixtures
 r5py.sampledata.helsinki>=0.1.1

{r5py-1.0.0.dev0 → r5py-1.0.0.dev3}/tests/test_travel_time_matrix.py

@@ -536,3 +536,51 @@ class TestTravelTimeMatrixComputer:
             ).compute_travel_times()
 
         geopandas.testing.assert_geodataframe_equal(ttm_new, ttm_old)
+
+    @pytest.mark.parametrize(
+        [
+            "transport_mode",
+            "expected_travel_times",
+        ],
+        [
+            (
+                r5py.TransportMode.BICYCLE,
+                pytest_lazy_fixtures.lf("travel_times_bicycle"),
+            ),
+            (
+                r5py.TransportMode.CAR,
+                pytest_lazy_fixtures.lf("travel_times_car"),
+            ),
+            (
+                r5py.TransportMode.TRANSIT,
+                pytest_lazy_fixtures.lf("travel_times_transit"),
+            ),
+            (
+                r5py.TransportMode.WALK,
+                pytest_lazy_fixtures.lf("travel_times_walk"),
+            ),
+        ],
+    )
+    def test_travel_times_by_transport_mode(
+        self,
+        transport_network,
+        population_grid_points,
+        departure_datetime,
+        transport_mode,
+        expected_travel_times,
+    ):
+        # subset to keep test comparison data sets small
+        origins = population_grid_points[::5].copy()
+        travel_times = r5py.TravelTimeMatrix(
+            transport_network,
+            origins=origins,
+            departure=departure_datetime,
+            transport_modes=[transport_mode],
+        )
+
+        travel_times = travel_times.reset_index(drop=True)
+
+        pandas.testing.assert_frame_equal(
+            travel_times,
+            expected_travel_times,
+        )