r5py 1.0.0.dev0__py3-none-any.whl → 1.0.0.dev1__py3-none-any.whl

r5py/__init__.py

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

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/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/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/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.dist-info → r5py-1.0.0.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: r5py
-Version: 1.0.0.dev0
+Version: 1.0.0.dev1
 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>
@@ -21,7 +21,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
@@ -35,14 +34,14 @@ Requires-Dist: contextily; extra == "docs"
 Requires-Dist: folium; extra == "docs"
 Requires-Dist: GitPython; extra == "docs"
 Requires-Dist: h3>=4.0.0b2; extra == "docs"
-Requires-Dist: jupyterlab-myst; extra == "docs"
+Requires-Dist: jupyterlab_myst; extra == "docs"
 Requires-Dist: mapclassify; extra == "docs"
 Requires-Dist: matplotlib; extra == "docs"
 Requires-Dist: myst-nb; extra == "docs"
 Requires-Dist: nbsphinx; extra == "docs"
 Requires-Dist: pybtex-apa7-style; extra == "docs"
 Requires-Dist: r5py.sampledata.helsinki>=0.1.1; extra == "docs"
-Requires-Dist: r5py.sampledata.sao-paulo>=0.1.1; extra == "docs"
+Requires-Dist: r5py.sampledata.sao_paulo>=0.1.1; extra == "docs"
 Requires-Dist: shapely; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-book-theme; extra == "docs"
@@ -52,11 +51,10 @@ 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"
-Requires-Dist: r5py.sampledata.sao-paulo>=0.1.1; extra == "tests"
+Requires-Dist: r5py.sampledata.sao_paulo>=0.1.1; extra == "tests"
 Requires-Dist: typing-extensions; extra == "tests"
 
 <img class="r5py_logo" align="right" src="https://github.com/r5py/r5py/raw/main/docs/_static/images/r5py_blue.svg" alt="r5py logo" style="width:180px; max-width:30vW;">

{r5py-1.0.0.dev0.dist-info → r5py-1.0.0.dev1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-r5py/__init__.py,sha256=8aG7qJXJb_PEHvRoC4PUA7i4CHF8bFS5k8Dgkbgc1X8,516
+r5py/__init__.py,sha256=dLvwVcoFrF66EZHPanirHxeT4j92KpifEbQ2ApAp_Os,517
 r5py/__main__.py,sha256=Wvn0ChD7E-dCSZ8b8k_HhHG0KMOk0qMNFkijGuSH3-0,81
 r5py/r5/__init__.py,sha256=N_55XlwBDUtljFEHIDYSFb4pPPHXsHdPfF-8qu9IjhQ,1071
 r5py/r5/access_leg.py,sha256=W3GfPEpqmWD1c4xipd6UcVIaBC-yb6srGCZV30E2dPY,293
@@ -15,14 +15,14 @@ r5py/r5/transit_layer.py,sha256=vVo_o10yDCzpujOQ99xdzmznwVjAbANjdDflQy2QOpI,3223
 r5py/r5/transit_leg.py,sha256=R0Qc9YLMEXYu51NIdo7Q0bdmpYIJf5irEDXWrW6pZWE,221
 r5py/r5/transport_mode.py,sha256=zHSqXb0R4oyjTp069CzO69IgoCKt0nmOAwsSy272rGo,3675
 r5py/r5/transport_network.py,sha256=d4PPBEBk3t2QbUI5KMS9zM-a4s4E4zEYOHIV6txCnYg,10777
-r5py/r5/travel_time_matrix.py,sha256=S76Ir53hFwsJeB2t2MrC1azu5apt6Sptgew9NNJO3YA,8028
+r5py/r5/travel_time_matrix.py,sha256=jrOt4n9kfShYGF5dou7xgKCEw8FBfyqc0wZeQZqD4wQ,7968
 r5py/r5/trip.py,sha256=AqhlhgYaGRL5jVzV08BhsqgWxe8f4wAb5HMP8HIGwc8,2944
 r5py/r5/trip_leg.py,sha256=9E4vZpBEJCXIVqAXWJvnPloC-upEASKhFnjiuen8i8A,6495
 r5py/r5/trip_planner.py,sha256=qUzzTA3PHcHkN7kNzAywhLFQswGDyPSgtkkvPZ9eJVQ,23819
 r5py/util/__init__.py,sha256=S-agt-08twU7hFIH1_x_VjuNC-WHfP6844n0xM0E8t8,714
 r5py/util/camel_to_snake_case.py,sha256=zj5F3PNBvsuS6vqN4USeeo8NI-3hnscGhwun0G95AK0,673
-r5py/util/classpath.py,sha256=Q8DETY-U_rY9UeFmrp3stxDj75wv-u7fhxXVp9AL00s,2773
-r5py/util/config.py,sha256=TpT67KZoHj17USjmGgiyH7HKa757CFXVk5nnBEio8E0,4667
+r5py/util/classpath.py,sha256=b16xL94pDxTpc0vrf68R1nvZHnHqZXGcFJaN36eW3wc,2773
+r5py/util/config.py,sha256=sAT3jJI69KH80fQsy9xi9-PkEUoOabLvLys9djRBils,4667
 r5py/util/contains_gtfs_data.py,sha256=ooX4hfVDKK0aqX1MI46jSFZ7dZ6riyXaORrgF6PUFrk,1211
 r5py/util/data_validation.py,sha256=H5Mcp2nS4vu5RKym20mPnGpl-8d0SDchzDRJBrrL6WE,1039
 r5py/util/environment.py,sha256=cbSM8TKTuhbXsTIIB06pMtydBOiqLkitF2Lj2asVTho,1082
@@ -31,12 +31,12 @@ r5py/util/good_enough_equidistant_crs.py,sha256=1aqJLghNwcd2FbLfODcht_6pyOEqhsrE
 r5py/util/jvm.py,sha256=NCwoYLDznXydcIRAZl2kzUQA6D6NCvzjVG74pm6ioR0,5027
 r5py/util/memory_footprint.py,sha256=p8efCUs4UXRg6P1GrRxVs71m7SpEw2mASoz6PVTRvgQ,4672
 r5py/util/parse_int_date.py,sha256=JmnV8TwdUdUp3kSp2e73ZSxCbRyqv2FmQzNt0I_MsM0,667
-r5py/util/sample_data_set.py,sha256=SRTFmhnhtwNCYtXRGPNKkh_lh3OEvgcyHS4Fz8N9uM8,2394
+r5py/util/sample_data_set.py,sha256=aqUCx6drWD-WbCauewO4EzgOGnFr35mAZt-YHlqb92k,2463
 r5py/util/snake_to_camel_case.py,sha256=uJ5hTCVDUEmIxTyy4LGFTbpGC_rtnjDZVQ2vmVRTQ4k,485
 r5py/util/validating_requests_session.py,sha256=sH5FgpS9eGax5DG2qA2GrGuiwgTJgh8tKsZ9OiXKmvk,1807
 r5py/util/warnings.py,sha256=CvxKWKlNO_p3riB4SkNqbU5AGPsaY_3-OzqaBObE3B8,139
-r5py-1.0.0.dev0.dist-info/LICENSE,sha256=VAnuGDX1TPylSN9G2xLa-urDpj_SQwn-qqs068dx4tk,51
-r5py-1.0.0.dev0.dist-info/METADATA,sha256=PpjIwfXHBYr9nU0MBk9OArFFYjmnz-lJHAhE3-U3TmM,10039
-r5py-1.0.0.dev0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-r5py-1.0.0.dev0.dist-info/top_level.txt,sha256=fOH1R85dkNDOI7jkg-lIsl5CQIO4fE5X868K9dTqs9U,5
-r5py-1.0.0.dev0.dist-info/RECORD,,
+r5py-1.0.0.dev1.dist-info/LICENSE,sha256=VAnuGDX1TPylSN9G2xLa-urDpj_SQwn-qqs068dx4tk,51
+r5py-1.0.0.dev1.dist-info/METADATA,sha256=ASMyJG4MtpW0fFfJqyXGYU8OgukawhubuBEaxLVyl4c,9956
+r5py-1.0.0.dev1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+r5py-1.0.0.dev1.dist-info/top_level.txt,sha256=fOH1R85dkNDOI7jkg-lIsl5CQIO4fE5X868K9dTqs9U,5
+r5py-1.0.0.dev1.dist-info/RECORD,,

{r5py-1.0.0.dev0.dist-info → r5py-1.0.0.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any