pyvalhalla-git 3.5.1.post187__cp39-cp39-manylinux_2_28_x86_64.whl → 3.6.0__cp39-cp39-manylinux_2_28_x86_64.whl

{pyvalhalla_git-3.5.1.post187.dist-info → pyvalhalla_git-3.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvalhalla-git
-Version: 3.5.1.post187
+Version: 3.6.0
 Summary: High-level bindings to the Valhalla C++ library
 Home-page: https://github.com/valhalla/valhalla
 Author: Nils Nolde
@@ -26,7 +26,7 @@ Dynamic: summary
 
 ## Valhalla Python bindings
 
-This package contains the Python bindings to [Valhalla routing engine](https://github.com/valhalla/valhalla).
+This folder contains the Python bindings to [Valhalla routing engine](https://github.com/valhalla/valhalla).
 
 > [!NOTE]
 > `pyvalhalla(-git)` packages are currently only published for:
@@ -34,9 +34,7 @@ This package contains the Python bindings to [Valhalla routing engine](https://g
 > - `win-amd64`
 > - `macos-arm64`
 
-### License
-
-Due to the dependencies we package, the Python bindings are licensed under GNU Lesser General Public License v2 or later (LGPLv2+).
+On top of the (very) high-level Python bindings, we package some data-building Valhalla executables to ease the process of graph creation.
 
 ### Installation
 
@@ -47,7 +45,9 @@ We distribute all currently maintained CPython versions as **binary wheels** for
 
 ### Usage
 
-Find a more extended notebook in `./examples`, e.g. how to [use the actor](./examples/actor_examples.ipynb).
+#### Bindings
+
+Find a more extended notebook in `./examples`, e.g. how to [use the actor](https://github.com/valhalla/valhalla/blob/master/src/bindings/python/examples/actor_examples.ipynb).
 
 Before using the Python bindings you need to have access to a routable Valhalla graph. Either install Valhalla from source and built the graph from OSM compatible data or use our [Valhalla docker image](https://github.com/gis-ops/docker-valhalla) for a painless experience, e.g. this will build the routing graph for Andorra in `./custom_files`:
 
@@ -71,6 +71,24 @@ actor = Actor(config)
 route = actor.route({"locations": [...]})
 ```
 
+#### Valhalla executables (**`linux-x86_x64` only**)
+
+To access the C++ (native) executables, there are 2 options:
+- (recommended) execute the module, e.g. `python -m valhalla valhalla_build_tiles -h`
+- execute the Python wrapper scripts directly, e.g. `valhalla_build_tiles -h`
+
+> [!NOTE]
+> For the latter option to work, the Python environment's `bin/` folder has to be in the `$PATH`. Inside virtual environments, that's always the case.
+
+Executing the scripts directly might also not work properly if there's a system-wide Valhalla installation, unless the Python environment's `bin/` folder has higher priority than system folders in `$PATH`. The module execution uses an explicit Python executable which should be preferred.
+
+There are also some additional commands we added:
+- `--help`: print the help for `python -m valhalla` explicitly
+- `--quiet`: redirect `stdout` of the C++ executables to `/dev/null`; can be added **once** anywhere in the command, will not be forwarded to a C++ executable
+- `print_bin_path`: simply prints the absolute path to the package-internal `bin/` directory where the C++ executables are; useful if the executables should be accessed directly in some script
+
+To find out which Valhalla executables are currently included, run `python -m valhalla --help`. We limit the number of executables to control the wheel size. However, we're open to include any other executable if there's a good reason.
+
 ### Building from source
 
 #### Linux
@@ -94,7 +112,7 @@ Once built, start a container to actually build Valhalla using AlmaLinux 8:
 ```shell
 cd valhalla
 docker run -dt -v $PWD:/valhalla-py --name valhalla-py --workdir /valhalla-py ghcr.io/valhalla/manylinux:2_28_valhalla_python
-docker exec -t valhalla-py /valhalla-py/src/bindings/python/build_linux.sh build_manylinux 3.12
+docker exec -t valhalla-py /valhalla-py/src/bindings/python/build_linux.sh build_manylinux 3.13
 ```
 
 This will also build & install `libvalhalla` before building the bindings. At this point there should be a `wheelhouse` folder with the fixed python wheel, ready to be installed or distributed to arbitrary python 3.12 installations.
@@ -104,11 +122,16 @@ This will also build & install `libvalhalla` before building the bindings. At th
 On our CI, this orchestrates the packaging of all `pyvalhalla` wheels for every supported, minor Python version and every platform. It can also be run locally (obviously only being able to build wheels for _your_ platform), e.g.
 
 ```shell
-# specifiers from https://cibuildwheel.pypa.io/en/stable/options/#build-skip
+python -m pip install cibuildwheel
+cibuildwheel --print-build-identifiers
 cibuildwheel --only cp313-manylinux_x86_64
 
 # for windows you'll have to set an env var to the vcpkg win root
 VCPKG_ARCH_ROOT="build/vcpkg_installed/custom-x64-windows" cibuildwheel --only cp313-manylinux_x86_64
 ```
 
-On Linux, this might download the `manylinux` docker image. In the end, you'll find the wheel in `./wheelhouse`.
+On Linux, this might download the [`manylinux` docker image](https://github.com/valhalla/manylinux/pkgs/container/manylinux). In the end, you'll find the wheel in `./wheelhouse`.
+
+### Testing (**`linux-x86_x64` only**)
+
+We have a small [test script](https://github.com/valhalla/valhalla/blob/master/src/bindings/python/test/test_pyvalhalla_package.sh) which makes sure that all the executables are working properly. If run locally for some reason, install a `pyvalhalla` wheel first. We run this in CI in a fresh Docker container with no dependencies installed, mostly to verify dynamic linking of the vendored dependencies.

{pyvalhalla_git-3.5.1.post187.dist-info → pyvalhalla_git-3.6.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-_valhalla.cpython-39-x86_64-linux-gnu.so,sha256=jEr33Gtx7feyNg5qA6yCYvj-JLctJ7lddqa3umJNH9A,14981745
+_valhalla.cpython-39-x86_64-linux-gnu.so,sha256=Yhzh1XfvHQel3tM5zP4GDyN9OrNhmGUZIRbcM24bx-c,14981769
 pyvalhalla_git.libs/libaec-91f0ca0f.so.0.0.8,sha256=GEdN1A2-2Ee3eA9OpLDk2Q_BCfD_w5OT26XF3eaiXkM,37697
 pyvalhalla_git.libs/libarmadillo-b35ffa1e.so.12.6.6,sha256=IwUzPx4x0YnMv_mNZpjL0AaGlYe0eubH6AuIUGI9iCA,98121
 pyvalhalla_git.libs/libarpack-042921fd.so.2.1.0,sha256=ih8rV9ek_fYnZlJnJtNs3oWzXIuZtU_-Ta0B6vU3lmQ,366689
@@ -7,29 +7,30 @@ pyvalhalla_git.libs/libbrotlicommon-6ce2a53c.so.1.0.6,sha256=zyiyGpvmy7huKm-JlWH
 pyvalhalla_git.libs/libbrotlidec-811d1be3.so.1.0.6,sha256=dmwMSDMQH7ShACzQjRinGgwh53QUkcxPZXYv0hEpmKI,62193
 pyvalhalla_git.libs/libbsd-526a917f.so.0.12.2,sha256=4rp1mSbErSoJwIIsNqEFBo1liqBV43-ITarb_u18-d0,88433
 pyvalhalla_git.libs/libbz2-a1e77c99.so.1.0.6,sha256=5hvZ8HbyaJrQBOyHAUvhVeH0kWm27etoKhiSFziIxhk,75049
-pyvalhalla_git.libs/libcfitsio-b4c37dff.so.7.3.47,sha256=c6hONSUSXaqE4RDFLuKKryPrjAmHsjwnmsACtW9EBGc,1648513
+pyvalhalla_git.libs/libcfitsio-b4c37dff.so.7.3.47,sha256=BrjHu4HRNkCS-O591oMvqEgW23P9_-3A-qjJ6wpTZss,1648537
 pyvalhalla_git.libs/libcom_err-b4375b23.so.2.1,sha256=-DVlAb7x4XecB0Obr0WdKphOEey_CfH7LCpzx-Dx20U,21545
 pyvalhalla_git.libs/libcrypt-52aca757.so.1.1.0,sha256=Rl6iBH7tI_X3G4lQfsNm9goOdNC29wIf_I77cVjQESc,140977
-pyvalhalla_git.libs/libcrypto-bdaed0ea.so.1.1.1k,sha256=teTU1EbwIqcxLKEwQCCxVDDLNnMUyvbgJRzPb37I3uo,3215921
-pyvalhalla_git.libs/libcurl-c96f124b.so.4.5.0,sha256=ShGqMFMuRbVf9Dn48QqJTtE8vwVVIsmqzAOVN7nNq54,619977
+pyvalhalla_git.libs/libcrypto-bdaed0ea.so.1.1.1k,sha256=FZwxdPnRjrvyuPE4DK2hCLGBi3WBMH6153Nwe5_D8Qk,3308689
+pyvalhalla_git.libs/libcurl-c96f124b.so.4.5.0,sha256=o8LWZwJT9AkkYuyfps1w0CrV1udeZefUg3N-CgJM8tY,620001
 pyvalhalla_git.libs/libczmq-d9886762.so.4.2.1,sha256=q_nJxo2HTNGcEktk09pnpJWSppnRR1xVbWrrslA5MPk,542025
 pyvalhalla_git.libs/libdap-7e467616.so.25.0.1,sha256=yoFZYmAcBm9g_I8otmBFwK7sdKRVo2DJ9ZfdRFtFzzo,2380601
 pyvalhalla_git.libs/libdapclient-5ca79ace.so.6.1.7,sha256=iwsLb5Wc7h8YJ37L-nKigdRFx3XgvSZljuDT5f7TCl4,403281
 pyvalhalla_git.libs/libdapserver-e7ab5c47.so.7.6.7,sha256=OQggaCpDqIn68RtB_2u53R-Q86iEZmUJ8SJyvMr_hWw,99113
-pyvalhalla_git.libs/libdf-2848fafa.so.0.0.0,sha256=GV0JRwDVmay_oU3hMOtsOr2ZCIsIDJWt3ytG6kCWnbk,592385
-pyvalhalla_git.libs/libfontconfig-dcb2ce6c.so.1.12.0,sha256=3nb_Xf-B09W7jsdd0Ep6M8sgkpaJVyUiEITA5r_Gweg,304865
-pyvalhalla_git.libs/libfreetype-2f3b32b6.so.6.16.1,sha256=aNd-t0Fl7VyxZi-ofi_S4MwOiZDqKNBXVJpi4Lb0E84,799545
+pyvalhalla_git.libs/libdf-2848fafa.so.0.0.0,sha256=U4BMy1cbTnytt3Ipdg6FmI4FZG9Nh_YxZBe8Q7qBK7M,592409
+pyvalhalla_git.libs/libexpat-d2b8ed35.so.1.6.7,sha256=lEkMPMR0keY_Vfyw2F6eNKDPa4J7WPM5yanuqGvh1Ic,252905
+pyvalhalla_git.libs/libfontconfig-dcb2ce6c.so.1.12.0,sha256=ov2Dsf_R--ddpsWVp8QpIjTnYrWqxAYB76T7dlMkx94,304897
+pyvalhalla_git.libs/libfreetype-2f3b32b6.so.6.16.1,sha256=Im372POhhwYIrkipfd-B00pKbhwbqLD60wleIlCVs-U,799569
 pyvalhalla_git.libs/libfreexl-c4cb0770.so.1.1.0,sha256=en-2F0qnAWkyFxLIZtJ6AI6uhjrDde5hRt6luJHxjTk,46785
-pyvalhalla_git.libs/libgdal-bed6323b.so.26.0.4,sha256=53WpfluAMrFPam2Ht0g-zpsYILLES5uxI0V9QVRdXCc,25912449
-pyvalhalla_git.libs/libgeos-3-54342c21.7.2.so,sha256=9d-KZHzxbxlFobE5KNQuCf8tGISDskzCf0LbzNdTMXo,2785809
-pyvalhalla_git.libs/libgeos_c-e683d5c0.so.1.11.2,sha256=7kWRzV7TLb6PQHU0WR1Uy9KBIsbyTrirBBvXoPjtukQ,310209
-pyvalhalla_git.libs/libgeotiff-cfdb9fd6.so.5.0.0,sha256=zkoKazRpBzk9vXxHu_0hAcvcbrSzoa7HtLBJEgnd_yE,227921
-pyvalhalla_git.libs/libgfortran-8f1e9814.so.5.0.0,sha256=qVzErEr62Iny2DCI9Gteb6bNXv1ynbiH4eY5FH7FW3M,2714697
+pyvalhalla_git.libs/libgdal-bed6323b.so.26.0.4,sha256=7pMd7Z1P_Vx1wjbrGkLpDpIrWDoEU-aDGr2_kuo1fO0,25912497
+pyvalhalla_git.libs/libgeos-40815548.so.3.13.1,sha256=ndVwAvJY3nwFxNQHmNB6eV932TnE1mPtp_3YsoGVqBc,4999793
+pyvalhalla_git.libs/libgeos_c-386b0945.so.1.19.2,sha256=zGNBBHxem0bjWBbdRrt2V2WN5LwVYv1B-Zn_qcDMKIE,510113
+pyvalhalla_git.libs/libgeotiff-cfdb9fd6.so.5.0.0,sha256=JRCKo-h_6hBhoU4epyC1qMfMC_52MnlY579CODwE1Fo,227945
+pyvalhalla_git.libs/libgfortran-8f1e9814.so.5.0.0,sha256=osiOwmN3jV_OAdSJU8lcZwXVK-_FTblrsMF8AaeAOW0,2714721
 pyvalhalla_git.libs/libgif-5ed6ffef.so.7.0.0,sha256=i19mAFnKEYemEOQFqyoi5GBad1vSdrrQ6-2HVffEmZI,46873
 pyvalhalla_git.libs/libgomp-870cb1d0.so.1.0.0,sha256=Ta6ZPLbakQH8LP74JzBt0DuJIBHS4nicjkSCjKnyWDw,253289
 pyvalhalla_git.libs/libgssapi_krb5-5b6840e5.so.2.2,sha256=zTS6gw0kgEUGor4jW30dslK1ger7zfQR9BbMBDNYT1Y,378601
 pyvalhalla_git.libs/libgta-6ed1f83a.so.1.0.0,sha256=oveLGR6wyS3z-zYWEjux3DfDnGyMvDLn6iqnvsIOniE,47545
-pyvalhalla_git.libs/libhdf5-b5e70f84.so.103.1.0,sha256=bHo6bEEPeX-bJARxt3H7BadA1APYeW3VZw8D5iasy9o,4007249
+pyvalhalla_git.libs/libhdf5-b5e70f84.so.103.1.0,sha256=TVlemnSAaOkxv4PVyar_WqRrj9hDo9mRbiHCHZHy4AI,4007273
 pyvalhalla_git.libs/libhdf5_hl-0b60eabd.so.100.1.2,sha256=bL6R_QGKadx8UM7SlfQgPZ7KJqW1nBqeN4sAeQIsUEM,165561
 pyvalhalla_git.libs/libidn2-2f4a5893.so.0.3.6,sha256=tElml3gdyDiZ61Dr9wncteS_pazPfYFpBEhnBI7aqQw,140377
 pyvalhalla_git.libs/libjasper-61dc4fbf.so.4.0.0,sha256=TSXz7eYrCQ-uFM2oTc4ww1mz32dlm0m2Mm_4AVsLixg,396545
@@ -38,12 +39,12 @@ pyvalhalla_git.libs/libjpeg-e87d2658.so.62.2.0,sha256=sRuavCl6x0zAPrZOEcsYFMAOLE
 pyvalhalla_git.libs/libjson-c-53e1d64f.so.4.0.0,sha256=_7l__xCHCYafuwbMOd6QMlwwW5gUT3OuxDrCfv1bXf4,74337
 pyvalhalla_git.libs/libk5crypto-404ad962.so.3.1,sha256=qR8T9MOIpu_crBlrnNSPCI6hVkqAmaBpy6brhy-chHY,110073
 pyvalhalla_git.libs/libkeyutils-2777d33d.so.1.6,sha256=Lxjn7VlUyYm6A8b4JMCptowYVig9FWTq8mEwh2PphLo,17929
-pyvalhalla_git.libs/libkmlbase-57a08976.so.1.3.0,sha256=RBsQV_XEmbT6RWZ5BtlvZ8VbXw6tIwnMoNirYR8EzzU,204865
-pyvalhalla_git.libs/libkmlconvenience-ff3e16e9.so.1.3.0,sha256=_vAHApFZ59gBWBB2U28dqeXruJBYgEGqEEJZghv1PHk,204433
-pyvalhalla_git.libs/libkmldom-137398f0.so.1.3.0,sha256=CX2a3dttEVHNfCYtKrTzqT9zr4AAmgEHIG2wrlGgtiU,1150513
-pyvalhalla_git.libs/libkmlengine-aab5dd2a.so.1.3.0,sha256=w_DZFgc2DCD-P5aGor4lPP0mMHEPC-bbTvY_PUDirpI,399633
-pyvalhalla_git.libs/libkmlregionator-d109603c.so.1.3.0,sha256=G7qlssYkatEsIuh-SzycYHBFuEjcBhi83qTmRHhI-BM,73377
-pyvalhalla_git.libs/libkmlxsd-2dcaca9b.so.1.3.0,sha256=vjlDekfYfVPB3E8lTG0_y1SmjzqSMUmAeBX_gHyYhCI,138889
+pyvalhalla_git.libs/libkmlbase-57a08976.so.1.3.0,sha256=rcmxYwqi1LJfwArRps4kI6eOCxSiZD3jk12gg_Szzf4,204921
+pyvalhalla_git.libs/libkmlconvenience-ff3e16e9.so.1.3.0,sha256=xWsQXW9Gep4NNQLaE_D81PQxyKloYNH1yo3FtLpWqQk,204481
+pyvalhalla_git.libs/libkmldom-137398f0.so.1.3.0,sha256=5Cz0AZnGFXn0-14rj70cGQ1bTw5wuU0PLIRT6q0lxVU,1150569
+pyvalhalla_git.libs/libkmlengine-aab5dd2a.so.1.3.0,sha256=m0KB29ILNsP8-klGfl8biBFrpwRspKZORdMenYZtzYY,399681
+pyvalhalla_git.libs/libkmlregionator-d109603c.so.1.3.0,sha256=u_K_ilsLmkryGBVCMH2ddhmuC1Pfrue1k36N8HhcemE,73425
+pyvalhalla_git.libs/libkmlxsd-2dcaca9b.so.1.3.0,sha256=hXR2KQa3SCkx6tL4zDPFPejqqroBLaOReP_30czYWAI,138937
 pyvalhalla_git.libs/libkrb5-eda01fcc.so.3.3,sha256=2bfY3YLiQwxzsyHR1-WTXUcWYuttmEfk9w7xUsU_xY0,1027097
 pyvalhalla_git.libs/libkrb5support-123248d0.so.0.1,sha256=F9DGlb34TNay8DVRdmFcT3244nXW4qkYlV_JQwHNduA,85161
 pyvalhalla_git.libs/liblapack-31d7d384.so.3.8.0,sha256=Q4BcY0EzqJXXo8OyRrLhkTU8OaYzRVCo1yhH8M70yBI,7808185
@@ -55,18 +56,18 @@ pyvalhalla_git.libs/libltdl-c869cdfb.so.7,sha256=pBQR20qv9VpwW9Kzl7btHUNThOiLyhB
 pyvalhalla_git.libs/libluajit-5-e85ce75d.1.so.2.1.0,sha256=97vuCX5NrFAFiptOCLcGFwGwXJHwURjMpdYSVaExwdk,524513
 pyvalhalla_git.libs/liblz4-a5753129.so.1.8.3,sha256=5f7UmcvMpsV5QfnvNRpO19pH3X8EOK9m_mKm-j6vg6Y,125881
 pyvalhalla_git.libs/liblzma-51a76f52.so.5.2.4,sha256=3EDuNDuc_qFaqWfrJ8TjbJH2lPntVHhFdyIyzxLyVuk,167585
-pyvalhalla_git.libs/libmariadb-b978418d.so.3,sha256=VcuF41MqPYUwtEke43gX9Ys2DMBMeuRxU7IHKNHlLdQ,371409
+pyvalhalla_git.libs/libmariadb-b978418d.so.3,sha256=Zm_TQeOIr0OXX4ZnLm6iany7aRxentgbmvjyN_msJX4,371433
 pyvalhalla_git.libs/libmd-3e096870.so.0.1.0,sha256=u4NgKhejcWdnUJ2XeY087UlHHQxI_vj3i4I2O9ic0Ig,67593
-pyvalhalla_git.libs/libmfhdf-38b34047.so.0.0.0,sha256=BGyzILyrzr8t74PLWebvUYps6keb30xFEzS0-1zo_b4,189121
-pyvalhalla_git.libs/libminizip-89ecf5b6.so.2.8.9,sha256=cY5VqVvi5p99y1l1qadbwBCeZPFQ34Q0rcu1OQpw_-A,343961
-pyvalhalla_git.libs/libnetcdf-3915b03a.so.15.0.1,sha256=0tdpbqDgfl9K3IseAXFg2ta0x8-nCmldTt2cfiztZEE,1421713
+pyvalhalla_git.libs/libmfhdf-38b34047.so.0.0.0,sha256=zlsl5u5MbAlOapnzFpAlABLsGkEhtwlRZ75LLyTjJzI,189145
+pyvalhalla_git.libs/libminizip-89ecf5b6.so.2.8.9,sha256=IrWYZtKmv0drR_HcuQwjpXYO8LYoV03uSo_5HwL6pC0,343985
+pyvalhalla_git.libs/libnetcdf-3915b03a.so.15.0.1,sha256=_5OdIpGHpA_E35CM_Po9Df6YX7ZC94_5x7q9ihw31hc,1421737
 pyvalhalla_git.libs/libnghttp2-39367a22.so.14.17.0,sha256=llfQElLBK10tju2J2kujCoHMuQDnxCASAhoWmQfQOO8,175025
 pyvalhalla_git.libs/libnspr4-50db7ede.so,sha256=7U-ViNCNu6Mj-H5b0Do1YdTqBnLLRDNCuFMwjpj2ihE,278289
 pyvalhalla_git.libs/libnss3-97de30de.so,sha256=QAdfWpJVnn5TQxLaGMhCl_ka0mGefsSKA0slia5vp0Y,1395721
 pyvalhalla_git.libs/libnssutil3-6f5c6901.so,sha256=rNnEt7CKA3tFJ4VKQkl5qfadoXUNe4EdLLIiBYH4XR8,236561
 pyvalhalla_git.libs/libodbc-cdeefa4a.so.2.0.0,sha256=6SojV8GfWsKv_ejENITJ_BEadoXV0l3Bkv3UlQFKAlE,564521
 pyvalhalla_git.libs/libodbcinst-433c34e3.so.2.0.0,sha256=Wb-qXnGUaeHv_iPEAf8-ooJsLdKHqUnQB6oDMytuYb8,133169
-pyvalhalla_git.libs/libogdi-48a138d1.so.4.1,sha256=4DNFXHpKsN_SdkgW0IyiiDPrjsOQeMQaOuI8LYu-Lro,140089
+pyvalhalla_git.libs/libogdi-48a138d1.so.4.1,sha256=70Y_0SBLOXSaTfFbA_vOUE5cTIqBd5BEr0FxvKxo15g,140137
 pyvalhalla_git.libs/libopenblaso-r0-d77a1985.3.15.so,sha256=AiFqF-Njr5Dg726ykl93ZDHY2rYvfatW4TTKZ7UME1Y,38700273
 pyvalhalla_git.libs/libopenblasp-r0-59ffcd50.3.15.so,sha256=1uI-clKs5UaNgrvbAoE31Sj10T_NUNudcYbUjk5LhA8,38683921
 pyvalhalla_git.libs/libopenjp2-88dcb7ba.so.2.4.0,sha256=zxkK31bmOl7wvfGVVxPNTra4ua5e3bNQMTe-yLIaGQw,376961
@@ -75,7 +76,7 @@ pyvalhalla_git.libs/libpcre2-8-516f4c9d.so.0.7.1,sha256=IcbljW_oKuAVlrAwKz8qtRZx
 pyvalhalla_git.libs/libpgm-5-d8330baa.2.so.0.0.122,sha256=o37Fuc6vaTuXY1gHOIIqgU2eWjGwetKUiAAC16655vM,421681
 pyvalhalla_git.libs/libplc4-5da7697c.so,sha256=RpOab0fTQWGOIUQM1cQ1wVXVU3jVQiYSs-yIrupQY-o,29537
 pyvalhalla_git.libs/libplds4-c96adacf.so,sha256=nMN2jcw0bZgWv5HP9Jim676_mc6HnhYVXWR6TQUcBII,26353
-pyvalhalla_git.libs/libpng16-748299c7.so.16.34.0,sha256=Z210PQGjR2IKZUFrIH8usUGiy5_QZQF-6YOT-z1sMgo,236961
+pyvalhalla_git.libs/libpng16-748299c7.so.16.34.0,sha256=CJF2GyfvO-P1rpjvQ_OcLxR7O8-hJws8rpQFX8bqVGE,243089
 pyvalhalla_git.libs/libpoppler-2ef877a6.so.104.0.0,sha256=gcw4FJnNUWFLqV9Qw_aYMuByNUVhe4Q2W4T6GbYfEDA,4377313
 pyvalhalla_git.libs/libpq-a39742ca.so.5.13,sha256=apf29T9oJY8Zt_Kqh3ageGBw-SGL2kW_BZQ743bX3n8,358201
 pyvalhalla_git.libs/libprime_server-d1a42131.so.0.6.7,sha256=Q-hMkMCR0XUCn-5q69qBj_Lq2nPmv6qDZ2oH7eQO8jI,2452545
@@ -87,13 +88,13 @@ pyvalhalla_git.libs/libsatlas-6c1f674f.so.3.10,sha256=3R5A2Nt42ulAKzO5al18b0Sbv0
 pyvalhalla_git.libs/libselinux-d0805dcb.so.1,sha256=iYGaLO-LIy5-WEihMiXHpeJUXyq56DDqGU49JbpfTu4,195097
 pyvalhalla_git.libs/libsmime3-374c4dc4.so,sha256=v3rZYChjGu5TE8pChRPu9KcwUpaqrChxYAluBvl54kE,211937
 pyvalhalla_git.libs/libsodium-2d1e6a3a.so.23.3.0,sha256=g5oRi005mSjgl1LyS0lhrdNX-QwbzchcN2x9QimD4cI,434873
-pyvalhalla_git.libs/libspatialite-779b5fe7.so.7.1.1,sha256=B0HNGuUnMZ0Cz27T7URV6bR54CCmFA9o-8dMLEHmt_w,7174105
-pyvalhalla_git.libs/libsqlite3-7a6fdc49.so.3.49.2,sha256=fURZqCuKNZQdTnFPE4AAHbzzf44EYlNyNeLFnRrULDM,7216393
-pyvalhalla_git.libs/libssh-c11d285b.so.4.8.7,sha256=pJAUqcNeoRNqZavEVWyfpgNSJZXBN-8AyIMCaAqv4K4,500185
-pyvalhalla_git.libs/libssl-60250281.so.1.1.1k,sha256=MCNuTI3K8vc-l_BvN5nElqPps2xW3COe2EZnuxtfQrE,666865
+pyvalhalla_git.libs/libspatialite-779b5fe7.so.7.1.1,sha256=8I-f0sCMhxBobtdPi7A_oBqWbZxZW0GoL7fcOAWueUs,7174129
+pyvalhalla_git.libs/libsqlite3-7a6fdc49.so.3.49.2,sha256=peF5Nffl4urZitdpoR6pDcVXjZUjlwbYkL5pFNK172Q,7224017
+pyvalhalla_git.libs/libssh-c11d285b.so.4.8.7,sha256=zvJgQnY0NnEVTjkKtexXHxC7zQ0qceBBRIkAHDpss5E,500209
+pyvalhalla_git.libs/libssl-60250281.so.1.1.1k,sha256=RCOXO__09WYzExJ2G4x3DrarhbGh7mbH11siXVR0_qw,666889
 pyvalhalla_git.libs/libsuperlu-17b63ae5.so.5.1,sha256=v-vhMkxagxoI0bfmQB36TbpwL_WIkp64AA-v2aBQE5c,583121
 pyvalhalla_git.libs/libsz-0deeef7d.so.2.0.1,sha256=oHMyDpIHEu8PwHfRYVYQnQ-jNECkLleGMrsSV9SXabg,16817
-pyvalhalla_git.libs/libtiff-84c53c12.so.5.3.0,sha256=PTVss_zdjG-4W0SAsaL3cS3MkN4pTkN9fkpsUjPE4QA,517801
+pyvalhalla_git.libs/libtiff-84c53c12.so.5.3.0,sha256=e68N-IIEHaGm3mirQSZP2rg7dK1mgc3b49gWFdet4A0,517825
 pyvalhalla_git.libs/libtirpc-cff449a4.so.3.0.0,sha256=8jAvYqXzCstumcLc8Y69ewqShYnBbrfzI65uSR77B2o,239849
 pyvalhalla_git.libs/libunistring-05abdd40.so.2.1.0,sha256=IxfT3Vuwa8TtEgGZDPNNtS5NtygqrJJwvXgaV8Ku3HU,1826161
 pyvalhalla_git.libs/libunwind-7e4e9a3c.so.8.0.1,sha256=EwQrqnFdpDy58YRUARVeOUUsTZNhfsb7K71pk6Sa7SQ,79577
@@ -101,18 +102,29 @@ pyvalhalla_git.libs/liburiparser-8aafb6b8.so.1.0.31,sha256=r-mzhgMuJyE6vAUSvvfmf
 pyvalhalla_git.libs/libuuid-95b83d40.so.1.3.0,sha256=Bj-_E8XyWfgC65o6pTuT9qLNcuA97EYDyCUUOfDR2q0,38041
 pyvalhalla_git.libs/libwebp-0b9c754d.so.7.0.2,sha256=EYSlMkseuy7mksJNLEZeie2EmgXh8SOKIuv7jbz0RUQ,457449
 pyvalhalla_git.libs/libxerces-c-3-f7c60809.2.so,sha256=AvLjV7pehcEa_7l5hr8SAE4q30iwD03S6Czh-aZMEMc,4706377
-pyvalhalla_git.libs/libxml2-54d19b2f.so.2.9.7,sha256=_L0cmQpE_Ag8yLaDcjYcD7HlArAMU7X7GJp4zsWylQc,1597833
+pyvalhalla_git.libs/libxml2-54d19b2f.so.2.9.7,sha256=7Hlah0Js_iDCsfRCX-DDHlZ9IGoMZ2mKlLCGSUjfsdE,1597857
+pyvalhalla_git.libs/libz-282eaf2a.so.1.2.11,sha256=jhlAOnGjWt4x1HjeCIqz6mXAuqM8fNbU45kDY-9lyC0,104817
 pyvalhalla_git.libs/libzmq-a60bbc04.so.5.2.4,sha256=PVj6lcs0afQZUC7fJTdKfRyaplq41L30sx-XCY4J6ow,804321
-valhalla/__init__.py,sha256=TQKBm2DP8mNh3OYJ-orTqk1KWGOum2U8fJo27IwQrBk,194
-valhalla/__version__.py,sha256=fUJPudoAYydBLozK46W_lClD7MtK4kD3D24zHiwVYDg,530
+valhalla/__init__.py,sha256=jxEX6PBKomyDW1D0On57Y52MIzBmmRQ8gnKb04p8tWg,374
+valhalla/__main__.py,sha256=2X-2Wd8BOXKG63pI8M-nA2nMya2eJGU16aFK3ye0UMQ,2069
+valhalla/__version__.py,sha256=eic-6Xs9-9wocSdGZ3Qt8lkpGHJbspTaUymbZDQfBkA,511
+valhalla/_scripts.py,sha256=-zpCo07ckNy9yQFs2BymmmYwKS94ZAhlRyHLPUsfEKg,1504
+valhalla/_valhalla.cc,sha256=3OorCxyOun1-Q9olHlHw75q3XlprX4Lgd4UKQSHahsY,3699
 valhalla/actor.py,sha256=MviJjb6ui1KwIzJbACHncuLNDdHkj1hyzCHlDD_yEjw,4077
 valhalla/config.py,sha256=kpYm-7RS4Mz3plcfGWNDx1s6tfXjnBGMei1uxhQ7VJM,1488
 valhalla/utils.py,sha256=VCxJ5rNX4Ha8Ey4T81y1b3Ke2svUwGn5TNyW8nC_8p8,1923
 valhalla/valhalla_build_config.py,sha256=WJJG6t6I8NnkGc_Wd4vSwI2mgZcwQqPrwvKph2AjfGc,42507
-pyvalhalla_git-3.5.1.post187.dist-info/METADATA,sha256=U5_omjLt3jjVJGrYfLlGB3sMSLKg0x5nN37ddO_rhVc,4773
-pyvalhalla_git-3.5.1.post187.dist-info/WHEEL,sha256=GgX20VmKcCojXA25QwkMazru5rPDAsLYhjc0VMiPAHQ,111
-pyvalhalla_git-3.5.1.post187.dist-info/top_level.txt,sha256=mU472JpF5fOfpVQ8UxZ_dwLmecLogajAMO5RmYsU1gw,19
-pyvalhalla_git-3.5.1.post187.dist-info/RECORD,,
-pyvalhalla_git-3.5.1.post187.dist-info/licenses/AUTHORS,sha256=IGm6Dg1NRkmFHV2GWvlPdfiqVoc1kfoc0pMbcKiCs30,171
-pyvalhalla_git-3.5.1.post187.dist-info/licenses/COPYING,sha256=i9sUrrsAX_p17jiQqhCyQrMMhAyqAbmWxWM4yiefN80,1135
-pyvalhalla_git-3.5.1.post187.dist-info/licenses/LICENSE.md,sha256=sZlxfQFAuJ8ba_1E8G3hYQ7eC770tBIywEWAg3rrixM,44
+valhalla/bin/valhalla_add_landmarks,sha256=ratQCuEAmGOWPUVKOQUYoY4f0Oe-QkM7LvxKyGtmd-8,8342216
+valhalla/bin/valhalla_add_predicted_traffic,sha256=NclodbUjtk_sygaknWjr1vPCc4PkmF6oEmwzX62xqwQ,3948272
+valhalla/bin/valhalla_build_admins,sha256=xUjDZescYypt50YuM40mJpJ6VyKOfh4_twk-KFoSFbQ,1391832
+valhalla/bin/valhalla_build_tiles,sha256=9shEEkOMuQCwECecJsKnszgwrnbHpDLwa9cWYwwxFaU,7004528
+valhalla/bin/valhalla_convert_transit,sha256=qH9IbC_IOOEmas1ORFf11P-zSZ92PFmdI2-UwjGw-G8,7759344
+valhalla/bin/valhalla_ingest_transit,sha256=r1sgKRFvNN4f7C3VbGcg3sjssLbQXS6neoqgkS2vRCc,3919264
+pyvalhalla_git-3.6.0.dist-info/METADATA,sha256=ZVANuP450Tvh5CtKqPfYW2FSwa_SWNiqHIXmBo-FvQE,6784
+pyvalhalla_git-3.6.0.dist-info/WHEEL,sha256=GgX20VmKcCojXA25QwkMazru5rPDAsLYhjc0VMiPAHQ,111
+pyvalhalla_git-3.6.0.dist-info/entry_points.txt,sha256=8F-7UTJvuCYMbRZJQzzCPbrt-vXHTsXMx0xlhG2VXiQ,308
+pyvalhalla_git-3.6.0.dist-info/top_level.txt,sha256=mU472JpF5fOfpVQ8UxZ_dwLmecLogajAMO5RmYsU1gw,19
+pyvalhalla_git-3.6.0.dist-info/RECORD,,
+pyvalhalla_git-3.6.0.dist-info/licenses/AUTHORS,sha256=IGm6Dg1NRkmFHV2GWvlPdfiqVoc1kfoc0pMbcKiCs30,171
+pyvalhalla_git-3.6.0.dist-info/licenses/COPYING,sha256=i9sUrrsAX_p17jiQqhCyQrMMhAyqAbmWxWM4yiefN80,1135
+pyvalhalla_git-3.6.0.dist-info/licenses/LICENSE.md,sha256=sZlxfQFAuJ8ba_1E8G3hYQ7eC770tBIywEWAg3rrixM,44

pyvalhalla_git-3.6.0.dist-info/entry_points.txt

@@ -0,0 +1,7 @@
+[console_scripts]
+valhalla_add_landmarks = valhalla._scripts:run
+valhalla_add_predicted_traffic = valhalla._scripts:run
+valhalla_build_admins = valhalla._scripts:run
+valhalla_build_tiles = valhalla._scripts:run
+valhalla_convert_transit = valhalla._scripts:run
+valhalla_ingest_transit = valhalla._scripts:run

valhalla/__init__.py

@@ -1,8 +1,16 @@
+from pathlib import Path
+
 try:
     from ._valhalla import *
 except ModuleNotFoundError:
     from _valhalla import *
-
 from .actor import Actor
 from .config import get_config, get_help
-from .__version__ import __version__
+
+# if run from CMake, Docker or tests
+try:
+    from .__version__ import __version__
+except ModuleNotFoundError:
+    __version__ = "undefined"
+
+PYVALHALLA_DIR = Path(__file__).parent.resolve()

valhalla/__main__.py

@@ -0,0 +1,68 @@
+import subprocess
+import sys
+from typing import Optional
+
+from ._scripts import PYVALHALLA_BIN_DIR, run
+from . import __version__
+
+PRINT_BIN_PATH = "print_bin_path"
+
+
+def print_help():
+    # left-align executable names
+    exe_names = [p.name for p in PYVALHALLA_BIN_DIR.iterdir()]
+    fixed_width = len(max(exe_names, key=lambda x: len(x)))
+
+    # TODO: we also want the git commit to show here, probably written to __version__.py by setup.py's BDistWheelCommand
+    print(
+        F"""
+valhalla Python package {__version__}
+
+pyvalhalla package provides a CLI to run Valhalla C++ executables. Arguments are simply passed on as they are.
+One notable exception is --quiet/-q, which will forward the C++ executable's stdout to /dev/null.
+'python -m valhalla --help' will print this help.
+
+Example usage: 'python -m valhalla --quiet valhalla_build_tiles -c valhalla.json -s initialize -e build test.pbf'
+
+Available commands (in {PYVALHALLA_BIN_DIR}):
+\t{PRINT_BIN_PATH:<{fixed_width}} - Print the absolute path of directory containing the C++ executables
+"""
+    )
+
+
+def main():
+    if len(sys.argv) < 2:
+        print("[FATAL] command needs arguments, see 'python -m valhalla --help': \n")
+        print_help()
+        sys.exit(1)
+
+    prog_or_opt = sys.argv[1]
+
+    if prog_or_opt in ("--help", "-h"):
+        print_help()
+        sys.exit(0)
+    elif prog_or_opt == PRINT_BIN_PATH:
+        # useful when another script wants to run the executables directly for some reason
+        print(PYVALHALLA_BIN_DIR)
+    else:
+        exc: Optional[Exception] = None
+        try:
+            run(from_main=True)
+        except (FileNotFoundError, subprocess.CalledProcessError) as e:
+            exc = e
+        finally:
+            if not exc:
+                sys.exit(0)
+
+            if isinstance(exc, subprocess.CalledProcessError):
+                print(f"Failed calling command '{exc.cmd}'\n")
+
+            print_help()
+            print("Sub-command failed with:\n")
+            print(exc, file=sys.stderr)
+
+            sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

valhalla/__version__.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.5.1.post187'
-__version_tuple__ = version_tuple = (3, 5, 1, 'post187')
+__version__ = version = '3.6.0'
+__version_tuple__ = version_tuple = (3, 6, 0)

valhalla/_scripts.py

@@ -0,0 +1,46 @@
+from pathlib import Path
+from shutil import which
+import subprocess
+import sys
+
+from . import PYVALHALLA_DIR
+
+PYVALHALLA_BIN_DIR = PYVALHALLA_DIR.joinpath("bin").resolve()
+
+
+def run(from_main=False) -> None:
+    """
+    Parses the command line arguments and runs the Valhalla executables with the
+    provided arguments. Note, by default we assume this is not being called by
+    __main__.py via e.g. 'python -m valhalla ...', but directly with e.g.d
+    'valhalla_build_tiles -h'. sys.argv relates to different executables for
+    both scenarios.
+
+    :param from_main: We parse sys.argv differently if it's called from __main__.py
+    """
+    prog = sys.argv[1] if from_main else Path(sys.argv[0]).name
+    prog_args = sys.argv[2:] if from_main else sys.argv[1:]
+
+    if not which(prog):
+        raise FileNotFoundError(f"Can't find executable at {prog}")
+    prog_path = PYVALHALLA_BIN_DIR.joinpath(prog).resolve()
+
+    print(f"[INFO] Running {prog_path} with args: {prog_args}...")
+
+    # --quiet/-q is our option, don't pass it to the executables
+    is_quiet = False
+    for arg in prog_args:
+        if arg not in ("--quiet", "-q"):
+            continue
+        prog_args.pop(prog_args.index(arg))
+        is_quiet = True
+
+    # recommended way to call exe
+    proc = subprocess.run(
+        [str(prog_path)] + prog_args,
+        stderr=sys.stderr,
+        stdout=subprocess.DEVNULL if is_quiet else sys.stdout,
+    )
+
+    # raises CalledProcessError if not successful
+    proc.check_returncode()

valhalla/_valhalla.cc

@@ -0,0 +1,81 @@
+#include "baldr/rapidjson_utils.h"
+#include "midgard/logging.h"
+#include "midgard/util.h"
+#include "tyr/actor.h"
+
+#include <boost/make_shared.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <pybind11/pybind11.h>
+
+#include <string>
+
+namespace vt = valhalla::tyr;
+namespace {
+
+// configuring multiple times is wasteful/ineffectual but not harmful
+// TODO: make this threadsafe just in case its abused
+const boost::property_tree::ptree configure(const std::string& config) {
+  boost::property_tree::ptree pt;
+  try {
+    // parse the config and configure logging
+    rapidjson::read_json(config, pt);
+
+    auto logging_subtree = pt.get_child_optional("mjolnir.logging");
+    if (logging_subtree) {
+      auto logging_config = valhalla::midgard::ToMap<const boost::property_tree::ptree&,
+                                                     std::unordered_map<std::string, std::string>>(
+          logging_subtree.get());
+      valhalla::midgard::logging::Configure(logging_config);
+    }
+  } catch (...) { throw std::runtime_error("Failed to load config from: " + config); }
+
+  return pt;
+}
+} // namespace
+
+namespace py = pybind11;
+
+PYBIND11_MODULE(_valhalla, m) {
+  py::class_<vt::actor_t>(m, "_Actor", "Valhalla Actor class")
+      .def(py::init<>([](std::string config) { return vt::actor_t(configure(config), true); }))
+      .def(
+          "route", [](vt::actor_t& self, std::string& req) { return self.route(req); },
+          "Calculates a route.")
+      .def(
+          "locate", [](vt::actor_t& self, std::string& req) { return self.locate(req); },
+          "Provides information about nodes and edges.")
+      .def(
+          "optimized_route",
+          [](vt::actor_t& self, std::string& req) { return self.optimized_route(req); },
+          "Optimizes the order of a set of waypoints by time.")
+      .def(
+          "matrix", [](vt::actor_t& self, std::string& req) { return self.matrix(req); },
+          "Computes the time and distance between a set of locations and returns them as a matrix table.")
+      .def(
+          "isochrone", [](vt::actor_t& self, std::string& req) { return self.isochrone(req); },
+          "Calculates isochrones and isodistances.")
+      .def(
+          "trace_route", [](vt::actor_t& self, std::string& req) { return self.trace_route(req); },
+          "Map-matching for a set of input locations, e.g. from a GPS.")
+      .def(
+          "trace_attributes",
+          [](vt::actor_t& self, std::string& req) { return self.trace_attributes(req); },
+          "Returns detailed attribution along each portion of a route calculated from a set of input locations, e.g. from a GPS trace.")
+      .def(
+          "height", [](vt::actor_t& self, std::string& req) { return self.height(req); },
+          "Provides elevation data for a set of input geometries.")
+      .def(
+          "transit_available",
+          [](vt::actor_t& self, std::string& req) { return self.transit_available(req); },
+          "Lookup if transit stops are available in a defined radius around a set of input locations.")
+      .def(
+          "expansion", [](vt::actor_t& self, std::string& req) { return self.expansion(req); },
+          "Returns all road segments which were touched by the routing algorithm during the graph traversal.")
+      .def(
+          "centroid", [](vt::actor_t& self, std::string& req) { return self.centroid(req); },
+          "Returns routes from all the input locations to the minimum cost meeting point of those paths.")
+      .def(
+          "status", [](vt::actor_t& self, std::string& req) { return self.status(req); },
+          "Returns nothing or optionally details about Valhalla's configuration.");
+}