pyvalhalla-git 3.5.1.post193__cp311-cp311-macosx_14_0_arm64.whl → 3.6.0.post0__cp311-cp311-macosx_14_0_arm64.whl

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvalhalla-git
-Version: 3.5.1.post193
+Version: 3.6.0.post0
 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.5.1.post193.dist-info → pyvalhalla_git-3.6.0.post0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 _valhalla.cpython-311-darwin.so,sha256=G6uefdkhtibfTw88P2RrKWv43FJGjBK6bToQRSvnTWA,11478848
-pyvalhalla_git-3.5.1.post193.dist-info/RECORD,,
-pyvalhalla_git-3.5.1.post193.dist-info/WHEEL,sha256=IDSs5FX6_bA_Je6GNgVyz6rcn2XC7t_ySnnLoSan-5o,136
-pyvalhalla_git-3.5.1.post193.dist-info/top_level.txt,sha256=mU472JpF5fOfpVQ8UxZ_dwLmecLogajAMO5RmYsU1gw,19
-pyvalhalla_git-3.5.1.post193.dist-info/METADATA,sha256=yE_nUq5JEu1Gdl7hI9obCXKTop4bRF0UoIMwrtDaK7U,6335
-pyvalhalla_git-3.5.1.post193.dist-info/licenses/LICENSE.md,sha256=sZlxfQFAuJ8ba_1E8G3hYQ7eC770tBIywEWAg3rrixM,44
-pyvalhalla_git-3.5.1.post193.dist-info/licenses/AUTHORS,sha256=IGm6Dg1NRkmFHV2GWvlPdfiqVoc1kfoc0pMbcKiCs30,171
-pyvalhalla_git-3.5.1.post193.dist-info/licenses/COPYING,sha256=i9sUrrsAX_p17jiQqhCyQrMMhAyqAbmWxWM4yiefN80,1135
+pyvalhalla_git-3.6.0.post0.dist-info/RECORD,,
+pyvalhalla_git-3.6.0.post0.dist-info/WHEEL,sha256=IDSs5FX6_bA_Je6GNgVyz6rcn2XC7t_ySnnLoSan-5o,136
+pyvalhalla_git-3.6.0.post0.dist-info/top_level.txt,sha256=mU472JpF5fOfpVQ8UxZ_dwLmecLogajAMO5RmYsU1gw,19
+pyvalhalla_git-3.6.0.post0.dist-info/METADATA,sha256=uzpMMvlVTOF183ebKJqt4o2qAYAGemUQg52C1UR2LNI,6790
+pyvalhalla_git-3.6.0.post0.dist-info/licenses/LICENSE.md,sha256=sZlxfQFAuJ8ba_1E8G3hYQ7eC770tBIywEWAg3rrixM,44
+pyvalhalla_git-3.6.0.post0.dist-info/licenses/AUTHORS,sha256=IGm6Dg1NRkmFHV2GWvlPdfiqVoc1kfoc0pMbcKiCs30,171
+pyvalhalla_git-3.6.0.post0.dist-info/licenses/COPYING,sha256=i9sUrrsAX_p17jiQqhCyQrMMhAyqAbmWxWM4yiefN80,1135
 valhalla/config.py,sha256=kpYm-7RS4Mz3plcfGWNDx1s6tfXjnBGMei1uxhQ7VJM,1488
 valhalla/_valhalla.cc,sha256=3OorCxyOun1-Q9olHlHw75q3XlprX4Lgd4UKQSHahsY,3699
-valhalla/__init__.py,sha256=hkaH-hN0yQ4NLDcAD-d5Jm1Qne6rc7HcDJimDZ92-B8,269
-valhalla/__version__.py,sha256=Ayqd5H42DgZ_KBT7ApCl3-fCyWjKpNYrTUjrUdD0Qz4,530
+valhalla/__init__.py,sha256=jxEX6PBKomyDW1D0On57Y52MIzBmmRQ8gnKb04p8tWg,374
+valhalla/__version__.py,sha256=3CR9tHm_p_sRxPJJWnncp-FiRECKyV5HyHanX3vMSMY,526
 valhalla/utils.py,sha256=VCxJ5rNX4Ha8Ey4T81y1b3Ke2svUwGn5TNyW8nC_8p8,1923
 valhalla/actor.py,sha256=MviJjb6ui1KwIzJbACHncuLNDdHkj1hyzCHlDD_yEjw,4077
 valhalla/_scripts.py,sha256=-zpCo07ckNy9yQFs2BymmmYwKS94ZAhlRyHLPUsfEKg,1504
 valhalla/valhalla_build_config.py,sha256=WJJG6t6I8NnkGc_Wd4vSwI2mgZcwQqPrwvKph2AjfGc,42507
-valhalla/__main__.py,sha256=X6B0ffW0-hWWJ-ZowzWnK9tFCF1himT3eQkTWyJ_xL0,2273
+valhalla/__main__.py,sha256=2X-2Wd8BOXKG63pI8M-nA2nMya2eJGU16aFK3ye0UMQ,2069
 valhalla/.dylibs/libsnappy.1.2.2.dylib,sha256=1D_MdNjNSmrGYQG30ZlmqXb2H1xTbacCevELbUEtRk0,79184
 valhalla/.dylibs/libhwy.1.2.0.dylib,sha256=Yrg_gB_yAOrT3Y494y1ePdkxz4-uSWDcin5WVWEmba4,96928
 valhalla/.dylibs/libIlmThread-3_3.32.3.3.3.dylib,sha256=Cbc2qNJa6hSvnHc_LWttt6wsd3ZgyI6CoCEd3yUlkXs,69744
@@ -89,7 +89,7 @@ valhalla/.dylibs/libssl.3.dylib,sha256=XbtHxY-Fp8FxFknYWDnlyKjSTUI44tPzH07xVDIzF
 valhalla/.dylibs/libabsl_log_internal_format.2407.0.0.dylib,sha256=1KEcZ4z8p2nlMUztcWAaZMEpQC1VDa3-Phv9cixj4Js,72112
 valhalla/.dylibs/libabsl_log_sink.2407.0.0.dylib,sha256=wmmSP56bkIXGQSKmKvqhXgp19sXigY12wt8boXNwxSU,68624
 valhalla/.dylibs/libarrow_dataset.2000.0.0.dylib,sha256=dIUWH4uFDQA5lC5-TLx_UyE6oF2HYWWV3hH9FVJ82dM,2432768
-valhalla/.dylibs/libprime_server.0.dylib,sha256=h_ScEhTzdwdHHS5UCpDq60I9j423In1XM84PM_MwIjY,393168
+valhalla/.dylibs/libprime_server.0.dylib,sha256=US-Ens9ctYyEqCRrDC9BdptthSkGj53XEQfNeZxAjMo,393168
 valhalla/.dylibs/libabsl_strerror.2407.0.0.dylib,sha256=p_NTirDupMktySlY_NFWEw-9vf3Q_mnDwvD2zO2uugI,53872
 valhalla/.dylibs/libnetcdf.22.dylib,sha256=B2gbziNwPMxNBjwrhgkAwpJeo76uXpxSGzHSWE9h1zc,1309456
 valhalla/.dylibs/libabsl_time.2407.0.0.dylib,sha256=4jzEGP5uO8FeGeMnPpxPiX2oDl_eiknqIDWaB93ENDU,111456

valhalla/__init__.py

@@ -6,6 +6,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.post0'
+__version_tuple__ = version_tuple = (3, 6, 0, 'post0')