pyvalhalla-git 3.5.1.post193__cp310-cp310-win_amd64.whl → 3.6.0__cp310-cp310-win_amd64.whl

pyvalhalla_git-3.6.0.dist-info/DELVEWHEEL

@@ -0,0 +1,2 @@
+Version: 1.10.1
+Arguments: ['C:\\hostedtoolcache\\windows\\Python\\3.9.13\\x64\\Scripts\\delvewheel', 'repair', '--add-path', 'build/vcpkg_installed/custom-x64-windows/bin', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-dvfz7_9f\\cp310-win_amd64\\built_wheel\\pyvalhalla_git-3.6.0-cp310-cp310-win_amd64.whl', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-dvfz7_9f\\cp310-win_amd64\\repaired_wheel']

{pyvalhalla_git-3.5.1.post193.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.post193
+Version: 3.6.0
 Summary: High-level bindings to the Valhalla C++ library
 Home-page: https://github.com/valhalla/valhalla
 Author: Nils Nolde
@@ -36,10 +36,6 @@ This folder contains the Python bindings to [Valhalla routing engine](https://gi
 
 On top of the (very) high-level Python bindings, we package some data-building Valhalla executables to ease the process of graph creation.
 
-### License
-
-Due to the dependencies we package, the Python bindings are licensed under GNU Lesser General Public License v2 or later (LGPLv2+).
-
 ### Installation
 
 We distribute all currently maintained CPython versions as **binary wheels** for Win64, MacOS (`arm64`) and Linux (`x86_64`) distributions with `glibc>=2.28`. We **do not** offer a source distribution on PyPI.
@@ -51,7 +47,7 @@ We distribute all currently maintained CPython versions as **binary wheels** for
 
 #### Bindings
 
-Find a more extended notebook in `./examples`, e.g. how to [use the actor](./examples/actor_examples.ipynb).
+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`:
 
@@ -75,7 +71,7 @@ actor = Actor(config)
 route = actor.route({"locations": [...]})
 ```
 
-#### Valhalla executables
+#### 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`
@@ -126,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.6.0.dist-info/RECORD

@@ -0,0 +1,38 @@
+_valhalla.cp310-win_amd64.pyd,sha256=ARkxzLuaHYZP9yZowTxo-q79c6H6c56XC3nZe5T7L3Q,8128000
+pyvalhalla_git-3.6.0.data/platlib/abseil_dll-bdd8a5a1f5a4da3f67279509940f7994.dll,sha256=1tPsKVjXYxXSMRqiwisqWBZqan9oTY0QdIbO1lkPkKA,1887744
+pyvalhalla_git-3.6.0.data/platlib/gdal-e68c9d36ee94002182307d221cc91ce3.dll,sha256=9hXkACzQk79BuHHgTl-ez5WRfMX1wbSvYKSq-erJW1w,18052096
+pyvalhalla_git-3.6.0.data/platlib/geos-b8640de6faf146d9855a807e72427e47.dll,sha256=rMxgojYCprUIpViJo_yVD_pdo-dMNrJDKjIdw7gDI9w,2582016
+pyvalhalla_git-3.6.0.data/platlib/geos_c-7d79920a3a18ad2c1ff594fcef060f0a.dll,sha256=4Y7CAmrVctYKVXfrZCg0VFvxhKaJHNijLPUdM6OtTTs,457728
+pyvalhalla_git-3.6.0.data/platlib/geotiff-020296779aedd28fd03f34200e6e3c61.dll,sha256=PWk3itN74x-HJAediz-Gjw83Z3NyTwa1cvXxA7h65w0,161792
+pyvalhalla_git-3.6.0.data/platlib/jpeg62-52d863f4f0f8139faf1608976c1d91f6.dll,sha256=SjnGiaIWwMiUwvuTBP_vkfsWjjvVLXkpmC7CFy5iDac,683520
+pyvalhalla_git-3.6.0.data/platlib/json-c-0d6db73c6075abe84a7bdd2a2d393471.dll,sha256=IlPXuHM61ne0troWglvEwMK378fN8duzzNGUog7p6YU,58880
+pyvalhalla_git-3.6.0.data/platlib/Lerc-d4ff05a506ddcfc551c350aa718ab4da.dll,sha256=-DySnPhaoH9nCPkQ2Y7Vq2w3pRWyg9B4NPbM-0l5Vcw,526848
+pyvalhalla_git-3.6.0.data/platlib/libcurl-bfd466d47923540033e77b192031a728.dll,sha256=nB2vYmFVYjnnrOeYwmbtHQY6xCwq6JDToh6oq71Tf0c,595456
+pyvalhalla_git-3.6.0.data/platlib/libexpat-6da76b3644b9424613b6d75323fcdc82.dll,sha256=vxuy9QhoEf_ft2kgIRIdOVVnfj_sVkU-Dhf6VhxZf-c,159232
+pyvalhalla_git-3.6.0.data/platlib/liblzma-9b97b163f3fff34e786ef56c4f919383.dll,sha256=ud-buTBlGnilzkiz-jyM8R8cECpICtG6YIlnRGwuCZU,185856
+pyvalhalla_git-3.6.0.data/platlib/libpng16-45e0d625267ecee5996170051645e533.dll,sha256=MZvYOuWjg9vqE9Vik1Q0bR19UEqakLekRuBBbsCWgCM,201216
+pyvalhalla_git-3.6.0.data/platlib/libprotobuf-lite-2bea258fef20ab8f71dcb2fec86675a8.dll,sha256=z437wWJ5T6V4xBrWjpXjFoXO4KeDXIzWfhJOE-yc1ZY,1502208
+pyvalhalla_git-3.6.0.data/platlib/lz4-cb6b9d0ac653fc68b286ff6ba7ef9bf5.dll,sha256=miEEE0apHQb6DFgVksS8WI1XNUuKI5dLDbp8JI4f_QA,127488
+pyvalhalla_git-3.6.0.data/platlib/msvcp140-73e7ea186a7d9ab676a764ffa64cf7e6.dll,sha256=cDrXxV8uCWYH7Gp3qLX1LVNdvnH93wIel8vLvCP3SSo,576128
+pyvalhalla_git-3.6.0.data/platlib/proj_9-3a2a70c01b92ddd4e14ab2bc22e06ab7.dll,sha256=K4UyFrthaMgtt5JDBbJBcS3fqLz-M4rbB0A_9mm-aL0,3414528
+pyvalhalla_git-3.6.0.data/platlib/qhull_r-46ecfc2e889bb30a2c3af738edb6eeb9.dll,sha256=r4AobL8RQVZlP8WWC5x3ia_Z2LcFwDJNX6g6nNo6k5I,451072
+pyvalhalla_git-3.6.0.data/platlib/sqlite3-219685aef036100e03dd97e60c61281d.dll,sha256=2pgdTUHtB3sMMJDytAVh6Ca83hcPjPK7BLrIBQVbosA,1118208
+pyvalhalla_git-3.6.0.data/platlib/tiff-f8c8a1908722e0556fad08f0b5c1bb6f.dll,sha256=znbA_SkIowGQeQ8bR22yrlCDH9xEcvK8BEVbGNOxlKI,468480
+pyvalhalla_git-3.6.0.data/platlib/zlib1-8425906e295d322425fe840dc45228db.dll,sha256=krva8_8mnj2x_8xU3AcXFXyjJFT0ybZhKiIWURHpYu0,90624
+pyvalhalla_git-3.6.0.dist-info/DELVEWHEEL,sha256=XBSy0vPJHraAqXrAUq-QA4xe8C5OxLT8OeVgdnFg9bI,425
+pyvalhalla_git-3.6.0.dist-info/METADATA,sha256=jwX-eoenRnISKSE-yftauFLxD5nCIIm9QMBj5aiMmGk,6921
+pyvalhalla_git-3.6.0.dist-info/RECORD,,
+pyvalhalla_git-3.6.0.dist-info/top_level.txt,sha256=mU472JpF5fOfpVQ8UxZ_dwLmecLogajAMO5RmYsU1gw,19
+pyvalhalla_git-3.6.0.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+pyvalhalla_git-3.6.0.dist-info/licenses/AUTHORS,sha256=zfqnWlS9zAHTcyIVTaquUA0hwOLARt8RbHyxV8ksIdo,176
+pyvalhalla_git-3.6.0.dist-info/licenses/COPYING,sha256=0-hXmYGEWqvizZa7uHZz_AefTiGcyE6O9mZH1e9Pf10,1157
+pyvalhalla_git-3.6.0.dist-info/licenses/LICENSE.md,sha256=TTSAvGrQ2khsitpI11WKnicjvEODZlalhi8PAzaRrV4,45
+valhalla/actor.py,sha256=_A8eZpk7xk-7C6Xzz5nFE5Qp5GNInFjXurzjlh_ZmFA,4195
+valhalla/config.py,sha256=LnxZ7uA42QOIB68ld_8VhRdTdsfs-sXQlu_AylLLFi4,1533
+valhalla/utils.py,sha256=-hHjEDCftpOlRBib4CSZVDCLAZMqgtOtkX2V3-5bsJg,1985
+valhalla/valhalla_build_config.py,sha256=xx8HY5RnP492PMP_DgJSgrum7OjkGWeUQAkZgag6LQM,43267
+valhalla/_scripts.py,sha256=t7qQvmsbTfw7aVyJtI0o6aClfoC1rt4KUT2C8YQer74,1550
+valhalla/_valhalla.cc,sha256=2PTlFjS5hA_mWn7_43zsSqx_lhjEzJZE2Ud6N3WpvnI,3780
+valhalla/__init__.py,sha256=vK5PDEKu-u4Zq0vJ4laWZyu8uCObPKLrMrlLZD05oJU,708
+valhalla/__main__.py,sha256=nRj1lPEotv-DDr6eTcQ7Y6WQc0jojCgqfNWcR2hs1Cg,2137
+valhalla/__version__.py,sha256=gjaLAkUsBET1sUPJb8F_jnhiFLEWqCIkrz1Y419AaLk,532

valhalla/__init__.py

@@ -17,6 +17,11 @@ 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

@@ -3,30 +3,31 @@ 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():
-    print(
-        "\npyvalhalla package provides a CLI to run Valhalla C++ executables. Arguments are simply passed on as they are."
-    )
-    print(
-        "One notable exception is --quiet/-q, which will forward the C++ executable's stdout to /dev/null."
-    )
-    print("'python -m valhalla --help' will print this help.")
-    print(
-        "\nExample usage: 'python -m valhalla --quiet valhalla_build_tiles -c valhalla.json -s initialize -e build test.pbf'"
-    )
-    print("\nAvailable commands:")
     # 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"\t{PRINT_BIN_PATH:<{fixed_width}} - Print the absolute path of directory containing the C++ executables"
+        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
+"""
     )
-    for command in exe_names:
-        print(f"\t{command:<{fixed_width}} - see usage with 'python -m pyvalhalla {command} --help' ")
 
 
 def main():
@@ -42,8 +43,6 @@ def main():
         sys.exit(0)
     elif prog_or_opt == PRINT_BIN_PATH:
         # useful when another script wants to run the executables directly for some reason
-        # in theory one doesn't even need a python installation for the Valhalla executables
-        # to still work, provided the correct wheel is used for the specific platform
         print(PYVALHALLA_BIN_DIR)
     else:
         exc: Optional[Exception] = None

valhalla/__version__.py

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

pyvalhalla_git-3.5.1.post193.dist-info/DELVEWHEEL

@@ -1,2 +0,0 @@
-Version: 1.10.1
-Arguments: ['C:\\hostedtoolcache\\windows\\Python\\3.9.13\\x64\\Scripts\\delvewheel', 'repair', '--add-path', 'build/vcpkg_installed/custom-x64-windows/bin', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-cdz2_su1\\cp310-win_amd64\\built_wheel\\pyvalhalla_git-3.5.1.post193-cp310-cp310-win_amd64.whl', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-cdz2_su1\\cp310-win_amd64\\repaired_wheel']

pyvalhalla_git-3.5.1.post193.dist-info/RECORD

@@ -1,38 +0,0 @@
-_valhalla.cp310-win_amd64.pyd,sha256=oveQC7kUre1flG1p12dMvBT2cQA06g0SnnJ9rMnddH0,8127488
-pyvalhalla_git-3.5.1.post193.data/platlib/abseil_dll-1fc67c8668f83d1a5bea7b37c99ca6c3.dll,sha256=JxC8gzXY3ULA4kzXVPmiGAH8pYggofnRKpuKI8RWs5Q,1887744
-pyvalhalla_git-3.5.1.post193.data/platlib/gdal-ef87f613f24439573ac93245419c57fb.dll,sha256=1ShlE9E_IYmbSDJaq7KruNMv0w_hbJ7q-2X93ePtcas,18052096
-pyvalhalla_git-3.5.1.post193.data/platlib/geos-6c521f6a54fa614211eebaea0a890f5e.dll,sha256=MRf-bLrP82WB92IKnuwkM6YMvd8gnIE9gp6S_B9kL-Y,2582016
-pyvalhalla_git-3.5.1.post193.data/platlib/geos_c-98a48e4eb33f944d74a394141acb7eaf.dll,sha256=M4Tea5iyOgcuTHtAb6UxjC8TDYETx6EWrNCFcxjhq90,457728
-pyvalhalla_git-3.5.1.post193.data/platlib/geotiff-e36440f3fa837002abf4656c8a82bee1.dll,sha256=OtzL5DG5Yi0MlvFQB-mgDiCkHtR98V8EGY9kAzWDEOc,161792
-pyvalhalla_git-3.5.1.post193.data/platlib/jpeg62-cdecd204dfd888a80dba8d7e15cb5b60.dll,sha256=3Njm9u2ynTA5_AON3ui6APK5bExn3Nxci_IYMuE4XUE,683520
-pyvalhalla_git-3.5.1.post193.data/platlib/json-c-520fb69b2bfce9e17f4c6595040d996f.dll,sha256=eSo-EsI3ISu3UGQcLEdRA4a84mOs_6PsWuNo7aW2Qfg,58880
-pyvalhalla_git-3.5.1.post193.data/platlib/Lerc-5492e53a634552d158814335bfd5508b.dll,sha256=hi5fqms3kpEnvFhz1eJdYYq4omMI_1Ve7iAUU-2iUv4,526848
-pyvalhalla_git-3.5.1.post193.data/platlib/libcurl-39889826283c088f2b3897191ab7d21d.dll,sha256=tf01uKIBv0LrQFBKzzhTuhnCANJLcKFMREepfIjbpDI,595456
-pyvalhalla_git-3.5.1.post193.data/platlib/libexpat-0a3bbd6de9307d0020c69673bdb3d5f1.dll,sha256=YNDK4-_p_xUPZU_U9i2iUKSxzk5w6sT9_RUtbFnggYQ,159232
-pyvalhalla_git-3.5.1.post193.data/platlib/liblzma-953b7b97af894314faccc0606d85cede.dll,sha256=v3x9ERcMQ_qQiLQoPeDBqEMIM4sdL14w9jjL7_WmqOc,185856
-pyvalhalla_git-3.5.1.post193.data/platlib/libpng16-4a1fbc9b57e99b9c7881563565bfd72a.dll,sha256=jCssnGKi0ui84VBxahsYSZZxNocwdJcUyncZehtkcoU,201216
-pyvalhalla_git-3.5.1.post193.data/platlib/libprotobuf-lite-ad9267b70ceeab0c301d0a1ec48f2c07.dll,sha256=3RbsupqD_7SrGoF7_zBSFthIDVFl7wRhoSuEhLi3Q2A,1502208
-pyvalhalla_git-3.5.1.post193.data/platlib/lz4-77ac014ecbb0e1818a064a0c084142a3.dll,sha256=2tUogjKUHWJga91pezGBczrFXVBsCa63N86rAuLdapA,127488
-pyvalhalla_git-3.5.1.post193.data/platlib/msvcp140-73e7ea186a7d9ab676a764ffa64cf7e6.dll,sha256=cDrXxV8uCWYH7Gp3qLX1LVNdvnH93wIel8vLvCP3SSo,576128
-pyvalhalla_git-3.5.1.post193.data/platlib/proj_9-0314b900bb5b081106b18666f0921a32.dll,sha256=L01PdfyGtx3E3xgrYj8cph5zdVgUgukGX47WK7KJZkw,3414528
-pyvalhalla_git-3.5.1.post193.data/platlib/qhull_r-4c36dd0bc4600521ef29dec0973a8da6.dll,sha256=2yVG47tZEHYsgZfdIUDfTrElFKNn94cQgx9iONqk34o,451072
-pyvalhalla_git-3.5.1.post193.data/platlib/sqlite3-9f887a0723821b9a01c3c1430763cead.dll,sha256=gtLH4aBFxIb9cG1YzUfDpKOkE6B3rxcWKIA16kdhNBY,1118208
-pyvalhalla_git-3.5.1.post193.data/platlib/tiff-2d8ce2b51dc79974e521d680e28b5a30.dll,sha256=0JvOzW9tXCUaTcNxVwbALYxb2ddgj-dFLUEFJ7AUXpc,468480
-pyvalhalla_git-3.5.1.post193.data/platlib/zlib1-882c7ca16198f8e2a6182b8f5d658a18.dll,sha256=u74_0pDv2tbGlcORzlK00nsSnRUSKelODkN9ZgZ_CjM,90624
-pyvalhalla_git-3.5.1.post193.dist-info/DELVEWHEEL,sha256=CKWuC4Dn3dbgjIBTgutGKyx5Tgzk1Mf5B_f-lc8HTzI,433
-pyvalhalla_git-3.5.1.post193.dist-info/METADATA,sha256=oH60IEslbgdDChpqlCFYiApblSbNFmie256lZmz5hHg,6471
-pyvalhalla_git-3.5.1.post193.dist-info/RECORD,,
-pyvalhalla_git-3.5.1.post193.dist-info/top_level.txt,sha256=mU472JpF5fOfpVQ8UxZ_dwLmecLogajAMO5RmYsU1gw,19
-pyvalhalla_git-3.5.1.post193.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
-pyvalhalla_git-3.5.1.post193.dist-info/licenses/AUTHORS,sha256=zfqnWlS9zAHTcyIVTaquUA0hwOLARt8RbHyxV8ksIdo,176
-pyvalhalla_git-3.5.1.post193.dist-info/licenses/COPYING,sha256=0-hXmYGEWqvizZa7uHZz_AefTiGcyE6O9mZH1e9Pf10,1157
-pyvalhalla_git-3.5.1.post193.dist-info/licenses/LICENSE.md,sha256=TTSAvGrQ2khsitpI11WKnicjvEODZlalhi8PAzaRrV4,45
-valhalla/actor.py,sha256=_A8eZpk7xk-7C6Xzz5nFE5Qp5GNInFjXurzjlh_ZmFA,4195
-valhalla/config.py,sha256=LnxZ7uA42QOIB68ld_8VhRdTdsfs-sXQlu_AylLLFi4,1533
-valhalla/utils.py,sha256=-hHjEDCftpOlRBib4CSZVDCLAZMqgtOtkX2V3-5bsJg,1985
-valhalla/valhalla_build_config.py,sha256=xx8HY5RnP492PMP_DgJSgrum7OjkGWeUQAkZgag6LQM,43267
-valhalla/_scripts.py,sha256=t7qQvmsbTfw7aVyJtI0o6aClfoC1rt4KUT2C8YQer74,1550
-valhalla/_valhalla.cc,sha256=2PTlFjS5hA_mWn7_43zsSqx_lhjEzJZE2Ud6N3WpvnI,3780
-valhalla/__init__.py,sha256=aV9sb4MMgTlHsEIPkaN4S_V0VXr_1n5cQ_25vrdFA3c,598
-valhalla/__main__.py,sha256=ospgDme8GI6mVxN4vocMFVSVs9BXJFu0rpWKOd2-9zU,2342
-valhalla/__version__.py,sha256=fjehpZJQbF3-ioF-kOWfjaG8CYpisbWv88fAhKMI7h0,551