diff --git a/pixi.lock b/pixi.lock index d712690..f6ab70d 100644 --- a/pixi.lock +++ b/pixi.lock @@ -46,6 +46,7 @@ environments: - conda: https://prefix.dev/conda-forge/linux-64/openssl-3.6.5-h781a0a9_0.conda - conda: https://prefix.dev/conda-forge/linux-64/patchelf-0.19.2-hee9eb32_0.conda - conda: https://prefix.dev/conda-forge/linux-64/py-rattler-0.28.1-py311hc91d8b8_0.conda + - conda: https://prefix.dev/conda-forge/linux-64/pydantic-core-2.46.5-py314h7e8cd81_2.conda - conda: https://prefix.dev/conda-forge/linux-64/pyrefly-1.2.0-hb17b654_0.conda - conda: https://prefix.dev/conda-forge/linux-64/python-3.14.0-h32b2ec7_102_cp314.conda - conda: https://prefix.dev/conda-forge/linux-64/pyyaml-6.0.3-py314h67df5f8_1.conda @@ -57,6 +58,8 @@ environments: - conda: https://prefix.dev/conda-forge/linux-64/yaml-0.2.5-hebe6cf0_3.conda - conda: https://prefix.dev/conda-forge/linux-64/zstd-1.5.7-hb8e6e7a_2.conda - conda: https://prefix.dev/conda-forge/noarch/_python_abi3_support-1.0-hd8ed1ab_3.conda + - conda: https://prefix.dev/conda-forge/noarch/annotated-doc-0.0.5-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/annotated-types-0.8.0-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/backports.zstd-1.7.0-py314h680f03e_0.conda - conda: https://prefix.dev/conda-forge/noarch/boolean.py-5.0-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-hbd8a1cb_0.conda @@ -81,6 +84,7 @@ environments: - conda: https://prefix.dev/conda-forge/noarch/networkx-3.6.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/packaging-25.0-pyh29332c3_1.conda - conda: https://prefix.dev/conda-forge/noarch/pluggy-1.6.0-pyhd8ed1ab_0.conda + - conda: https://prefix.dev/conda-forge/noarch/pydantic-2.13.5-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/pygments-2.19.2-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/pyparsing-3.3.2-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/pysocks-1.7.1-pyha55dd90_7.conda @@ -94,14 +98,20 @@ environments: - conda: https://prefix.dev/conda-forge/noarch/rospkg-1.6.1-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/ruamel.yaml-0.19.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/setuptools-84.0.0-pyh332efcf_0.conda + - conda: https://prefix.dev/conda-forge/noarch/shellingham-1.5.4-pyhd8ed1ab_2.conda - conda: https://prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda - conda: https://prefix.dev/conda-forge/noarch/tomli-2.3.0-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typer-0.29.0-pyh5ded981_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typing-extensions-4.15.0-h396c80c_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typing-inspection-0.4.5-pyh5ded981_0.conda - conda: https://prefix.dev/conda-forge/noarch/typing_extensions-4.15.0-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/tzdata-2025b-h78e105d_0.conda - conda: https://prefix.dev/conda-forge/noarch/urllib3-2.7.0-pyhd8ed1ab_0.conda - - conda_source: vinca[6a5a7c42] @ . + - conda_source: vinca[9761a393] @ . osx-64: - conda: https://prefix.dev/conda-forge/noarch/_python_abi3_support-1.0-hd8ed1ab_3.conda + - conda: https://prefix.dev/conda-forge/noarch/annotated-doc-0.0.5-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/annotated-types-0.8.0-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/backports.zstd-1.7.0-py314h680f03e_0.conda - conda: https://prefix.dev/conda-forge/noarch/boolean.py-5.0-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-hbd8a1cb_0.conda @@ -126,6 +136,7 @@ environments: - conda: https://prefix.dev/conda-forge/noarch/networkx-3.6.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/packaging-25.0-pyh29332c3_1.conda - conda: https://prefix.dev/conda-forge/noarch/pluggy-1.6.0-pyhd8ed1ab_0.conda + - conda: https://prefix.dev/conda-forge/noarch/pydantic-2.13.5-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/pygments-2.19.2-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/pyparsing-3.3.2-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/pysocks-1.7.1-pyha55dd90_7.conda @@ -139,8 +150,12 @@ environments: - conda: https://prefix.dev/conda-forge/noarch/rospkg-1.6.1-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/ruamel.yaml-0.19.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/setuptools-84.0.0-pyh332efcf_0.conda + - conda: https://prefix.dev/conda-forge/noarch/shellingham-1.5.4-pyhd8ed1ab_2.conda - conda: https://prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda - conda: https://prefix.dev/conda-forge/noarch/tomli-2.3.0-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typer-0.29.0-pyh5ded981_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typing-extensions-4.15.0-h396c80c_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typing-inspection-0.4.5-pyh5ded981_0.conda - conda: https://prefix.dev/conda-forge/noarch/typing_extensions-4.15.0-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/tzdata-2025b-h78e105d_0.conda - conda: https://prefix.dev/conda-forge/noarch/urllib3-2.7.0-pyhd8ed1ab_0.conda @@ -157,6 +172,7 @@ environments: - conda: https://prefix.dev/conda-forge/osx-64/ncurses-6.5-h0622a9a_3.conda - conda: https://prefix.dev/conda-forge/osx-64/openssl-3.5.4-h230baf5_0.conda - conda: https://prefix.dev/conda-forge/osx-64/py-rattler-0.28.1-py311h85c30bf_0.conda + - conda: https://prefix.dev/conda-forge/osx-64/pydantic-core-2.46.5-py314h3cfb53e_2.conda - conda: https://prefix.dev/conda-forge/osx-64/pyrefly-1.2.0-h19f9e61_0.conda - conda: https://prefix.dev/conda-forge/osx-64/python-3.14.0-hf88997e_102_cp314.conda - conda: https://prefix.dev/conda-forge/osx-64/pyyaml-6.0.3-py314h10d0514_1.conda @@ -167,9 +183,11 @@ environments: - conda: https://prefix.dev/conda-forge/osx-64/tk-8.6.13-hf689a15_2.conda - conda: https://prefix.dev/conda-forge/osx-64/yaml-0.2.5-had63097_3.conda - conda: https://prefix.dev/conda-forge/osx-64/zstd-1.5.7-h8210216_2.conda - - conda_source: vinca[67e1c53a] @ . + - conda_source: vinca[ddc7a8c1] @ . osx-arm64: - conda: https://prefix.dev/conda-forge/noarch/_python_abi3_support-1.0-hd8ed1ab_3.conda + - conda: https://prefix.dev/conda-forge/noarch/annotated-doc-0.0.5-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/annotated-types-0.8.0-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/backports.zstd-1.7.0-py314h680f03e_0.conda - conda: https://prefix.dev/conda-forge/noarch/boolean.py-5.0-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-hbd8a1cb_0.conda @@ -194,6 +212,7 @@ environments: - conda: https://prefix.dev/conda-forge/noarch/networkx-3.6.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/packaging-25.0-pyh29332c3_1.conda - conda: https://prefix.dev/conda-forge/noarch/pluggy-1.6.0-pyhd8ed1ab_0.conda + - conda: https://prefix.dev/conda-forge/noarch/pydantic-2.13.5-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/pygments-2.19.2-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/pyparsing-3.3.2-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/pysocks-1.7.1-pyha55dd90_7.conda @@ -207,8 +226,12 @@ environments: - conda: https://prefix.dev/conda-forge/noarch/rospkg-1.6.1-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/ruamel.yaml-0.19.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/setuptools-84.0.0-pyh332efcf_0.conda + - conda: https://prefix.dev/conda-forge/noarch/shellingham-1.5.4-pyhd8ed1ab_2.conda - conda: https://prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda - conda: https://prefix.dev/conda-forge/noarch/tomli-2.3.0-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typer-0.29.0-pyh5ded981_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typing-extensions-4.15.0-h396c80c_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typing-inspection-0.4.5-pyh5ded981_0.conda - conda: https://prefix.dev/conda-forge/noarch/typing_extensions-4.15.0-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/tzdata-2025b-h78e105d_0.conda - conda: https://prefix.dev/conda-forge/noarch/urllib3-2.7.0-pyhd8ed1ab_0.conda @@ -226,6 +249,7 @@ environments: - conda: https://prefix.dev/conda-forge/osx-arm64/ncurses-6.5-h5e97a16_3.conda - conda: https://prefix.dev/conda-forge/osx-arm64/openssl-3.5.4-h5503f6c_0.conda - conda: https://prefix.dev/conda-forge/osx-arm64/py-rattler-0.28.1-py311h1e0e963_0.conda + - conda: https://prefix.dev/conda-forge/osx-arm64/pydantic-core-2.46.5-py314hc05cd11_2.conda - conda: https://prefix.dev/conda-forge/osx-arm64/pyrefly-1.2.0-h6fdd925_0.conda - conda: https://prefix.dev/conda-forge/osx-arm64/python-3.14.0-h40d2674_102_cp314.conda - conda: https://prefix.dev/conda-forge/osx-arm64/pyyaml-6.0.3-py314h6e9b3f0_1.conda @@ -236,9 +260,11 @@ environments: - conda: https://prefix.dev/conda-forge/osx-arm64/tk-8.6.13-h892fb3f_2.conda - conda: https://prefix.dev/conda-forge/osx-arm64/yaml-0.2.5-h74c22ad_3.conda - conda: https://prefix.dev/conda-forge/osx-arm64/zstd-1.5.7-h6491c7d_2.conda - - conda_source: vinca[3f434182] @ . + - conda_source: vinca[485b9dee] @ . win-64: - conda: https://prefix.dev/conda-forge/noarch/_python_abi3_support-1.0-hd8ed1ab_3.conda + - conda: https://prefix.dev/conda-forge/noarch/annotated-doc-0.0.5-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/annotated-types-0.8.0-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/backports.zstd-1.7.0-py314h680f03e_0.conda - conda: https://prefix.dev/conda-forge/noarch/boolean.py-5.0-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/ca-certificates-2025.10.5-h4c7d964_0.conda @@ -263,6 +289,7 @@ environments: - conda: https://prefix.dev/conda-forge/noarch/networkx-3.6.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/packaging-25.0-pyh29332c3_1.conda - conda: https://prefix.dev/conda-forge/noarch/pluggy-1.6.0-pyhd8ed1ab_0.conda + - conda: https://prefix.dev/conda-forge/noarch/pydantic-2.13.5-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/pygments-2.19.2-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/pyparsing-3.3.2-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/pysocks-1.7.1-pyh09c184e_7.conda @@ -276,8 +303,12 @@ environments: - conda: https://prefix.dev/conda-forge/noarch/rospkg-1.6.1-pyhd8ed1ab_0.conda - conda: https://prefix.dev/conda-forge/noarch/ruamel.yaml-0.19.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/setuptools-84.0.0-pyh332efcf_0.conda + - conda: https://prefix.dev/conda-forge/noarch/shellingham-1.5.4-pyhd8ed1ab_2.conda - conda: https://prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda - conda: https://prefix.dev/conda-forge/noarch/tomli-2.3.0-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typer-0.29.0-pyh5ded981_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typing-extensions-4.15.0-h396c80c_0.conda + - conda: https://prefix.dev/conda-forge/noarch/typing-inspection-0.4.5-pyh5ded981_0.conda - conda: https://prefix.dev/conda-forge/noarch/typing_extensions-4.15.0-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/tzdata-2025b-h78e105d_0.conda - conda: https://prefix.dev/conda-forge/noarch/urllib3-2.7.0-pyhd8ed1ab_0.conda @@ -293,6 +324,7 @@ environments: - conda: https://prefix.dev/conda-forge/win-64/markupsafe-3.0.3-py314h2359020_1.conda - conda: https://prefix.dev/conda-forge/win-64/openssl-3.5.4-h725018a_0.conda - conda: https://prefix.dev/conda-forge/win-64/py-rattler-0.28.1-py311h66afae6_0.conda + - conda: https://prefix.dev/conda-forge/win-64/pydantic-core-2.46.5-py314h9f07db2_2.conda - conda: https://prefix.dev/conda-forge/win-64/pyrefly-1.2.0-h18a1a76_0.conda - conda: https://prefix.dev/conda-forge/win-64/python-3.14.0-h4b44e0e_102_cp314.conda - conda: https://prefix.dev/conda-forge/win-64/pyyaml-6.0.3-py314h2359020_1.conda @@ -306,7 +338,7 @@ environments: - conda: https://prefix.dev/conda-forge/win-64/vcomp14-14.44.35208-h818238b_32.conda - conda: https://prefix.dev/conda-forge/win-64/yaml-0.2.5-h6a83c73_3.conda - conda: https://prefix.dev/conda-forge/win-64/zstd-1.5.7-hbeecb71_2.conda - - conda_source: vinca[a943a887] @ . + - conda_source: vinca[da38084e] @ . packages: - conda: https://prefix.dev/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 sha256: fe51de6107f9edc7aa4f786a70f4a883943bc9d39b3bb7307c04c41410990726 @@ -785,6 +817,22 @@ packages: run_exports: {} size: 15049429 timestamp: 1793309611253 +- conda: https://prefix.dev/conda-forge/linux-64/pydantic-core-2.46.5-py314h7e8cd81_2.conda + sha256: 7887472515d5d2d3b57bd38d3b055ae24f98c399b9a9387ac441e97bda775884 + md5: 76d65459d9ac0eb2ecb48d6650c5ced1 + depends: + - python + - typing-extensions >=4.6.0,!=4.7.0 + - libgcc >=15 + - __glibc >=2.17,<3.0.a0 + - python_abi 3.14.* *_cp314 + constrains: + - __glibc >=2.17 + license: MIT + license_family: MIT + run_exports: {} + size: 1876209 + timestamp: 1789996107060 - conda: https://prefix.dev/conda-forge/linux-64/pyrefly-1.2.0-hb17b654_0.conda sha256: 937a57a855f4a7f0994a561fbee5a089d509faf9b0668ae2fd02a71dc606dc4f md5: 2c8a7d2685e9b1aff86433c47a883431 @@ -1033,6 +1081,28 @@ packages: run_exports: {} size: 8144 timestamp: 1784221492234 +- conda: https://prefix.dev/conda-forge/noarch/annotated-doc-0.0.5-pyhcf101f3_0.conda + sha256: a0a320c709fded9b5178108dedebf81a1f5a5d9c7720e3af50c1ab058dadd296 + md5: d68ec17cb915cab4642357417ec0a104 + depends: + - python >=3.10 + - python + license: MIT + license_family: MIT + run_exports: {} + size: 16785 + timestamp: 1785335690199 +- conda: https://prefix.dev/conda-forge/noarch/annotated-types-0.8.0-pyhd8ed1ab_0.conda + sha256: b8fcb994134d3918d1c64a9d62f4168ff85d5bfb89e698102fe4ed679fe0df24 + md5: 108c928d2a8551832dbc762b535e90bb + depends: + - python >=3.10 + - typing-extensions >=4.0.0 + license: MIT + license_family: MIT + run_exports: {} + size: 19461 + timestamp: 1784935220549 - conda: https://prefix.dev/conda-forge/noarch/backports.zstd-1.7.0-py314h680f03e_0.conda noarch: generic sha256: 19514d89d1e725e44b0650d31a4d43da8e070e4e93e4131e3b16bd139404f2b2 @@ -1385,6 +1455,21 @@ packages: run_exports: {} size: 25877 timestamp: 1764896838868 +- conda: https://prefix.dev/conda-forge/noarch/pydantic-2.13.5-pyhcf101f3_0.conda + sha256: 701ed8122021f62e1c9a46bdf4932ada911c10afa56ba0459f56da940bcbe5a7 + md5: 2d0f9304fc1cb1e3e94e7b37c14cd70a + depends: + - typing-inspection >=0.4.2 + - typing_extensions >=4.14.1 + - python >=3.10 + - annotated-types >=0.6.0 + - pydantic-core ==2.46.5 + - python + license: MIT + license_family: MIT + run_exports: {} + size: 346633 + timestamp: 1787941273167 - conda: https://prefix.dev/conda-forge/noarch/pygments-2.19.2-pyhd8ed1ab_0.conda sha256: 5577623b9f6685ece2697c6eb7511b4c9ac5fb607c9babc2646c811b428fd46a md5: 6b6ece66ebcae2d5f326c77ef2c5a066 @@ -1564,6 +1649,16 @@ packages: run_exports: {} size: 524488 timestamp: 1786282924579 +- conda: https://prefix.dev/conda-forge/noarch/shellingham-1.5.4-pyhd8ed1ab_2.conda + sha256: 1d6534df8e7924d9087bd388fbac5bd868c5bf8971c36885f9f016da0657d22b + md5: 83ea3a2ddb7a75c1b09cea582aa4f106 + depends: + - python >=3.10 + license: MIT + license_family: MIT + run_exports: {} + size: 15018 + timestamp: 1762858315311 - conda: https://prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda sha256: 458227f759d5e3fcec5d9b7acce54e10c9e1f4f4b7ec978f3bfd54ce4ee9853d md5: 3339e3b65d58accf4ca4fb8748ab16b3 @@ -1620,6 +1715,43 @@ packages: run_exports: {} size: 24210 timestamp: 1780385194431 +- conda: https://prefix.dev/conda-forge/noarch/typer-0.29.0-pyh5ded981_0.conda + sha256: e0e98c372dc47488d8c49c47800c8ce8da29eb6a66ebd4befd03c7b6fb71f44d + md5: 50b1de5cb639dff936c40b1577015f9a + depends: + - annotated-doc >=0.0.2 + - colorama + - pydantic >=2.5.3 + - python >=3.11 + - rich >=13.8.0 + - shellingham >=1.3.0 + - python + license: MIT AND BSD-3-Clause + run_exports: {} + size: 188861 + timestamp: 1794265878787 +- conda: https://prefix.dev/conda-forge/noarch/typing-extensions-4.15.0-h396c80c_0.conda + sha256: 7c2df5721c742c2a47b2c8f960e718c930031663ac1174da67c1ed5999f7938c + md5: edd329d7d3a4ab45dcf905899a7a6115 + depends: + - typing_extensions ==4.15.0 pyhcf101f3_0 + license: PSF-2.0 + license_family: PSF + run_exports: {} + size: 91383 + timestamp: 1756220668932 +- conda: https://prefix.dev/conda-forge/noarch/typing-inspection-0.4.5-pyh5ded981_0.conda + sha256: 88c08476c98f264047d6c6bfeb1e8545684dfbcf2c61da338f71033ec17e1f33 + md5: 9b49216bf058592d9ef924e64602f029 + depends: + - python >=3.11 + - typing_extensions >=4.15.0 + - python + license: MIT + license_family: MIT + run_exports: {} + size: 20983 + timestamp: 1793805183548 - conda: https://prefix.dev/conda-forge/noarch/typing_extensions-4.15.0-pyhcf101f3_0.conda sha256: 032271135bca55aeb156cee361c81350c6f3fb203f57d024d7e5a1fc9ef18731 md5: 0caa1af407ecff61170c9437a808404d @@ -1942,6 +2074,21 @@ packages: run_exports: {} size: 14590908 timestamp: 1793309708900 +- conda: https://prefix.dev/conda-forge/osx-64/pydantic-core-2.46.5-py314h3cfb53e_2.conda + sha256: ec0f6728291df87422067b915d9946e3de57ab1c381dfee6bcdf7df20ae49602 + md5: 83949db745fcf6b80714da51754e9e05 + depends: + - python + - typing-extensions >=4.6.0,!=4.7.0 + - __osx >=11.0 + - python_abi 3.14.* *_cp314 + constrains: + - __osx >=11.0 + license: MIT + license_family: MIT + run_exports: {} + size: 1862424 + timestamp: 1789996183831 - conda: https://prefix.dev/conda-forge/osx-64/pyrefly-1.2.0-h19f9e61_0.conda sha256: 5c5802b4fb5d051ee6e666e4b8adec6de0733a619fb7f507ec374e45984003d8 md5: c7de32d660332c51ec5fd4421b1486cd @@ -2453,6 +2600,21 @@ packages: run_exports: {} size: 13242554 timestamp: 1793309637666 +- conda: https://prefix.dev/conda-forge/osx-arm64/pydantic-core-2.46.5-py314hc05cd11_2.conda + sha256: 256814b2dc04478143e2d04edef1e607f78ea27afc89613e9f4b89716411436a + md5: e68173ea947c93cdaa84bf0e22da6f8c + depends: + - python + - typing-extensions >=4.6.0,!=4.7.0 + - __osx >=11.0 + - python_abi 3.14.* *_cp314 + constrains: + - __osx >=11.0 + license: MIT + license_family: MIT + run_exports: {} + size: 1691226 + timestamp: 1789996111805 - conda: https://prefix.dev/conda-forge/osx-arm64/pyrefly-1.2.0-h6fdd925_0.conda sha256: ecb46769c4b863b3a5aaa3932e06972907439d83a612253de6155f9d47d1e6ab md5: 958874b3b5800b69299c402002608b84 @@ -2944,6 +3106,21 @@ packages: run_exports: {} size: 16468002 timestamp: 1793309604859 +- conda: https://prefix.dev/conda-forge/win-64/pydantic-core-2.46.5-py314h9f07db2_2.conda + sha256: bb6d18b646f00144bdd898984fcbf6987d9964adc6fed93111dc2e2b554261a4 + md5: dac7a7c4b8a24342b62b31d9f850498d + depends: + - python + - typing-extensions >=4.6.0,!=4.7.0 + - vc >=14.3,<15 + - vc14_runtime >=14.44.35208 + - ucrt >=10.0.20348.0 + - python_abi 3.14.* *_cp314 + license: MIT + license_family: MIT + run_exports: {} + size: 1861810 + timestamp: 1789996123032 - conda: https://prefix.dev/conda-forge/win-64/pyrefly-1.2.0-h18a1a76_0.conda sha256: e61ebfd255a77f090d8093fc50e048df111afce7222407eb41003185b2ac63ae md5: 281d3c3c1d8a12e19c5e3f4fa2a248f9 @@ -3234,7 +3411,7 @@ packages: purls: [] size: 354697 timestamp: 1742433568506 -- conda_source: vinca[3f434182] @ . +- conda_source: vinca[485b9dee] @ . variants: target_platform: noarch depends: @@ -3250,6 +3427,7 @@ packages: - jinja2 >=3.0.0 - license-expression >=30.0.0 - py-rattler >=0.28.1,<0.29 + - typer >=0.12 license: MIT host_packages: - conda: https://prefix.dev/conda-forge/noarch/ca-certificates-2026.7.22-hbd8a1cb_0.conda @@ -3280,52 +3458,7 @@ packages: - conda: https://prefix.dev/conda-forge/osx-arm64/tk-8.6.13-hbeba79b_4.conda - conda: https://prefix.dev/conda-forge/osx-arm64/uv-0.12.8-h0e72303_0.conda - conda: https://prefix.dev/conda-forge/osx-arm64/zstd-1.5.7-hf451053_7.conda -- conda_source: vinca[67e1c53a] @ . - variants: - target_platform: noarch - depends: - - python >=3.9 - - python * - - catkin_pkg >=0.4.16 - - ruamel.yaml >=0.19.1,<0.20.0 - - rosdistro >=0.8.0 - - empy >=3.3.4,<4.0.0 - - requests >=2.24.0 - - networkx >=2.5 - - rich >=10 - - jinja2 >=3.0.0 - - license-expression >=30.0.0 - - py-rattler >=0.28.1,<0.29 - license: MIT - host_packages: - - conda: https://prefix.dev/conda-forge/noarch/ca-certificates-2026.7.22-hbd8a1cb_0.conda - - conda: https://prefix.dev/conda-forge/noarch/editables-0.6-pyhcf101f3_0.conda - - conda: https://prefix.dev/conda-forge/noarch/hatchling-1.32.0-pyhcf101f3_0.conda - - conda: https://prefix.dev/conda-forge/noarch/packaging-26.3-pyhc364b38_0.conda - - conda: https://prefix.dev/conda-forge/noarch/pathspec-1.1.1-pyhd8ed1ab_0.conda - - conda: https://prefix.dev/conda-forge/noarch/pluggy-1.6.0-pyhf9edf01_1.conda - - conda: https://prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda - - conda: https://prefix.dev/conda-forge/noarch/tomli-2.4.1-pyhcf101f3_0.conda - - conda: https://prefix.dev/conda-forge/noarch/tomlkit-0.15.1-pyhcf101f3_0.conda - - conda: https://prefix.dev/conda-forge/noarch/trove-classifiers-2026.6.1.19-pyhcf101f3_0.conda - - conda: https://prefix.dev/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda - - conda: https://prefix.dev/conda-forge/osx-64/bzip2-1.0.8-h374f1ed_10.conda - - conda: https://prefix.dev/conda-forge/osx-64/libcxx-23.1.0-h19cb2f5_0.conda - - conda: https://prefix.dev/conda-forge/osx-64/libexpat-2.8.1-hcc62823_1.conda - - conda: https://prefix.dev/conda-forge/osx-64/libffi-3.7.0-h6b3a05b_1.conda - - conda: https://prefix.dev/conda-forge/osx-64/liblzma-5.8.3-hbb4bfdb_1.conda - - conda: https://prefix.dev/conda-forge/osx-64/libmpdec-4.0.0-ha1e9b39_2.conda - - conda: https://prefix.dev/conda-forge/osx-64/libpython-3.14.7-hfe304d0_104_cp314.conda - - conda: https://prefix.dev/conda-forge/osx-64/libsqlite-3.53.4-ha5db789_1.conda - - conda: https://prefix.dev/conda-forge/osx-64/libzlib-1.3.2-hbb4bfdb_3.conda - - conda: https://prefix.dev/conda-forge/osx-64/ncurses-6.6-hcc0dc9a_1.conda - - conda: https://prefix.dev/conda-forge/osx-64/openssl-3.6.4-h332eb6d_0.conda - - conda: https://prefix.dev/conda-forge/osx-64/python-3.14.7-hafa0b4b_104_cp314.conda - - conda: https://prefix.dev/conda-forge/osx-64/readline-8.3-h000c2f7_1.conda - - conda: https://prefix.dev/conda-forge/osx-64/tk-8.6.13-ha6c374e_4.conda - - conda: https://prefix.dev/conda-forge/osx-64/uv-0.12.7-h6c1caad_0.conda - - conda: https://prefix.dev/conda-forge/osx-64/zstd-1.5.7-hbc1a06c_7.conda -- conda_source: vinca[6a5a7c42] @ . +- conda_source: vinca[9761a393] @ . variants: target_platform: noarch depends: @@ -3341,6 +3474,7 @@ packages: - jinja2 >=3.0.0 - license-expression >=30.0.0 - py-rattler >=0.28.1,<0.29 + - typer >=0.12 license: MIT host_packages: - conda: https://prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-20_gnu.conda @@ -3376,7 +3510,7 @@ packages: - conda: https://prefix.dev/conda-forge/noarch/tomlkit-0.15.1-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/trove-classifiers-2026.6.1.19-pyhcf101f3_0.conda - conda: https://prefix.dev/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda -- conda_source: vinca[a943a887] @ . +- conda_source: vinca[da38084e] @ . variants: target_platform: noarch depends: @@ -3392,6 +3526,7 @@ packages: - jinja2 >=3.0.0 - license-expression >=30.0.0 - py-rattler >=0.28.1,<0.29 + - typer >=0.12 license: MIT host_packages: - conda: https://prefix.dev/conda-forge/noarch/ca-certificates-2026.7.22-h4c7d964_0.conda @@ -3422,3 +3557,49 @@ packages: - conda: https://prefix.dev/conda-forge/win-64/vc14_runtime-14.51.36247-habf1de7_41.conda - conda: https://prefix.dev/conda-forge/win-64/vcomp14-14.51.36247-habf1de7_41.conda - conda: https://prefix.dev/conda-forge/win-64/zstd-1.5.7-h534d264_7.conda +- conda_source: vinca[ddc7a8c1] @ . + variants: + target_platform: noarch + depends: + - python >=3.9 + - python * + - catkin_pkg >=0.4.16 + - ruamel.yaml >=0.19.1,<0.20.0 + - rosdistro >=0.8.0 + - empy >=3.3.4,<4.0.0 + - requests >=2.24.0 + - networkx >=2.5 + - rich >=10 + - jinja2 >=3.0.0 + - license-expression >=30.0.0 + - py-rattler >=0.28.1,<0.29 + - typer >=0.12 + license: MIT + host_packages: + - conda: https://prefix.dev/conda-forge/noarch/ca-certificates-2026.7.22-hbd8a1cb_0.conda + - conda: https://prefix.dev/conda-forge/noarch/editables-0.6-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/hatchling-1.32.0-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/packaging-26.3-pyhc364b38_0.conda + - conda: https://prefix.dev/conda-forge/noarch/pathspec-1.1.1-pyhd8ed1ab_0.conda + - conda: https://prefix.dev/conda-forge/noarch/pluggy-1.6.0-pyhf9edf01_1.conda + - conda: https://prefix.dev/conda-forge/noarch/python_abi-3.14-8_cp314.conda + - conda: https://prefix.dev/conda-forge/noarch/tomli-2.4.1-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/tomlkit-0.15.1-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/trove-classifiers-2026.6.1.19-pyhcf101f3_0.conda + - conda: https://prefix.dev/conda-forge/noarch/tzdata-2026c-h151e31d_0.conda + - conda: https://prefix.dev/conda-forge/osx-64/bzip2-1.0.8-h374f1ed_10.conda + - conda: https://prefix.dev/conda-forge/osx-64/libcxx-23.1.0-h19cb2f5_0.conda + - conda: https://prefix.dev/conda-forge/osx-64/libexpat-2.8.1-hcc62823_1.conda + - conda: https://prefix.dev/conda-forge/osx-64/libffi-3.7.0-h6b3a05b_1.conda + - conda: https://prefix.dev/conda-forge/osx-64/liblzma-5.8.3-hbb4bfdb_1.conda + - conda: https://prefix.dev/conda-forge/osx-64/libmpdec-4.0.0-ha1e9b39_2.conda + - conda: https://prefix.dev/conda-forge/osx-64/libpython-3.14.7-hfe304d0_104_cp314.conda + - conda: https://prefix.dev/conda-forge/osx-64/libsqlite-3.53.4-ha5db789_1.conda + - conda: https://prefix.dev/conda-forge/osx-64/libzlib-1.3.2-hbb4bfdb_3.conda + - conda: https://prefix.dev/conda-forge/osx-64/ncurses-6.6-hcc0dc9a_1.conda + - conda: https://prefix.dev/conda-forge/osx-64/openssl-3.6.4-h332eb6d_0.conda + - conda: https://prefix.dev/conda-forge/osx-64/python-3.14.7-hafa0b4b_104_cp314.conda + - conda: https://prefix.dev/conda-forge/osx-64/readline-8.3-h000c2f7_1.conda + - conda: https://prefix.dev/conda-forge/osx-64/tk-8.6.13-ha6c374e_4.conda + - conda: https://prefix.dev/conda-forge/osx-64/uv-0.12.7-h6c1caad_0.conda + - conda: https://prefix.dev/conda-forge/osx-64/zstd-1.5.7-hbc1a06c_7.conda diff --git a/pyproject.toml b/pyproject.toml index 1ac16a5..34e2c44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,6 +39,7 @@ dependencies = [ "jinja2 >=3.0.0", "license-expression >=30.0.0", "py-rattler >=0.28.1,<0.29", + "typer >=0.12", ] [project.urls] diff --git a/vinca/main.py b/vinca/main.py index 6b76ea6..4de851d 100644 --- a/vinca/main.py +++ b/vinca/main.py @@ -2,16 +2,15 @@ from __future__ import annotations -import argparse import glob import os -import sys from argparse import Namespace from pathlib import Path -from typing import Any, Optional +from typing import Annotated, Any, Optional import catkin_pkg import ruamel.yaml +import typer from vinca import __version__, config from vinca.utils import built_for_distro, get_channel_records, get_pkg_build_number @@ -73,85 +72,13 @@ def get_conda_subdir() -> str: return detect_conda_subdir(selected) -def parse_command_line(argv: list[str]) -> Namespace: - """ - Parse command line argument. See -h option. - :param argv: the actual program arguments - :return: parsed arguments - """ - import textwrap - - default_dir = "." - - example = textwrap.dedent( - """ - Examples: - {0} -d ./examples/ - See: https://github.com/RoboStack/vinca - """ - ).format(os.path.basename(argv[0])) - formatter_class = argparse.RawDescriptionHelpFormatter - parser = argparse.ArgumentParser( - description="Conda recipe generator for ROS packages", - epilog=example, - formatter_class=formatter_class, - ) - parser.add_argument( - "-V", "--version", action="version", version="%(prog)s {}".format(__version__) - ) - parser.add_argument( - "-d", - "--dir", - dest="dir", - default=default_dir, - help="The directory to process (default: {}).".format(default_dir), - ) - parser.add_argument( - "-s", - "--skip", - dest="skip_already_built_repodata", - default=[], - help="Skip already built from repodata.", - ) - parser.add_argument( - "-m", - "--multiple", - dest="multiple_file", - action="store_const", - const=True, - default=False, - help="Create one recipe for package.", - ) - parser.add_argument( - "-n", - "--trigger-new-versions", - dest="trigger_new_versions", - action="store_const", - const=True, - default=False, - help="Trigger the build of packages that have new versions available.", - ) - parser.add_argument( - "--source", - dest="source", - action="store_const", - const=True, - default=False, - help="Create recipe with develop repo.", - ) - parser.add_argument( - "-p", "--package", dest="package", default=None, help="The package.xml path." - ) - parser.add_argument( - "--platform", - dest="platform", - default=None, - help="The conda platform to check existing recipes for.", - ) - arguments = parser.parse_args(argv[1:]) - config.parsed_args = arguments - config.selected_platform = get_conda_subdir() - return arguments +app = typer.Typer(add_completion=False, pretty_exceptions_enable=False) + + +def print_version(value: bool) -> None: + if value: + typer.echo(f"vinca {__version__}") + raise typer.Exit() def read_vinca_yaml(filepath: str | Path): @@ -456,7 +383,7 @@ def get_selected_packages(distro: Distro, vinca_conf): return result -def parse_package(pkg, distro: Distro, vinca_conf, path): +def parse_package(pkg, distro: Distro, vinca_conf, path: str): name = pkg["name"].replace("_", "-") final_name = get_package_name(name, distro, vinca_conf) @@ -649,24 +576,70 @@ def print_generation_summary(distro: Distro, vinca_conf, outputs) -> None: console.print(f"Total generated recipes: [bold]{len(rows) + len(leftovers)}[/bold]") -def main() -> None: +@app.command( + epilog="Example: vinca -d ./examples/\n\nSee: https://github.com/RoboStack/vinca" +) +def generate( + dir: Annotated[ + str, typer.Option("-d", "--dir", help="The directory to process.") + ] = ".", + skip_already_built_repodata: Annotated[ + Optional[list[str]], + typer.Option("-s", "--skip", help="Skip already built from repodata."), + ] = None, + multiple_file: Annotated[ + bool, typer.Option("-m", "--multiple", help="Create one recipe for package.") + ] = False, + trigger_new_versions: Annotated[ + bool, + typer.Option( + "-n", + "--trigger-new-versions", + help="Trigger the build of packages that have new versions available.", + ), + ] = False, + source_version: Annotated[ + bool, typer.Option("--source", help="Create recipe with develop repo.") + ] = False, + package: Annotated[ + Optional[str], typer.Option("-p", "--package", help="The package.xml path.") + ] = None, + platform: Annotated[ + Optional[str], + typer.Option( + "--platform", help="The conda platform to check existing recipes for." + ), + ] = None, + version: Annotated[ + bool, + typer.Option( + "-V", + "--version", + callback=print_version, + is_eager=True, + help="Show the version and exit.", + ), + ] = False, +) -> None: + """Conda recipe generator for ROS packages.""" global distro, unsatisfied_deps - arguments = parse_command_line(sys.argv) + config.parsed_args = Namespace(platform=platform) + config.selected_platform = get_conda_subdir() - base_dir = os.path.abspath(arguments.dir) + base_dir = os.path.abspath(dir) vinca_yaml = os.path.join(base_dir, "vinca.yaml") vinca_conf = read_vinca_yaml(vinca_yaml) - if arguments.trigger_new_versions: + if trigger_new_versions: vinca_conf["trigger_new_versions"] = True else: vinca_conf["trigger_new_versions"] = vinca_conf.get( "trigger_new_versions", False ) - if arguments.package: - pkg_files = glob.glob(arguments.package) + if package: + pkg_files = glob.glob(package) python_version = None if "python_version" in vinca_conf: @@ -697,13 +670,13 @@ def main() -> None: if compatibility_recipe is not None: recipes.append(compatibility_recipe) - if arguments.multiple_file: + if multiple_file: for generated_recipe in recipes: write_recipe_package(generated_recipe) else: outputs.extend(recipes) - if not arguments.multiple_file: + if not multiple_file: sources = {} for output in outputs: source = output.pop("source", None) @@ -714,13 +687,11 @@ def main() -> None: else: # (name, version, build string) of the published builds; None: skip nothing published = None - if arguments.skip_already_built_repodata or vinca_conf.get("skip_existing"): + if skip_already_built_repodata or vinca_conf.get("skip_existing"): published = set() skip_built_packages = set() vinca_conf["skip_built_packages"] = skip_built_packages - fn = arguments.skip_already_built_repodata - if not fn: - fn = vinca_conf.get("skip_existing") + fns = list(skip_already_built_repodata or vinca_conf["skip_existing"]) yaml = ruamel.yaml.YAML() additional_recipe_names = set() @@ -729,7 +700,7 @@ def main() -> None: ): with open(add_rec, encoding="utf-8") as fi: add_rec_y = yaml.load(fi) - if arguments.platform == "emscripten-wasm32": + if platform == "emscripten-wasm32": additional_recipe_names.add(add_rec_y["package"]["name"]) else: if add_rec_y["package"]["name"] not in [ @@ -746,13 +717,12 @@ def main() -> None: print("Found additional recipes: ", additional_recipe_names) - fns = list(fn) for fn in fns: selected_bn = None print(f"Fetching repodata: {fn}") records = get_channel_records(fn, get_conda_subdir()) - if arguments.multiple_file: + if multiple_file: # compared by exact build string once the recipes are written published |= published_builds(records, vinca_conf["ros_distro"]) continue @@ -801,14 +771,14 @@ def main() -> None: vinca_conf["_selected_pkgs"] = selected_pkgs - if arguments.source: + if source_version: source = generate_source_version(distro, vinca_conf) outputs = generate_outputs_version(distro, vinca_conf) else: source = generate_source(distro, vinca_conf) outputs = generate_outputs(distro, vinca_conf) - if arguments.multiple_file: + if multiple_file: write_recipe(source, outputs, vinca_conf, distro, False) if published is not None: variant_config = Path(base_dir) / "conda_build_config.yaml" @@ -829,3 +799,7 @@ def main() -> None: print("Unsatisfied dependencies:", unsatisfied_deps) print("build scripts are created successfully.") + + +def main() -> None: + app() diff --git a/vinca/template.py b/vinca/template.py index 8e1e32b..82375c7 100644 --- a/vinca/template.py +++ b/vinca/template.py @@ -5,7 +5,7 @@ import stat from importlib import resources from pathlib import Path -from typing import TextIO +from typing import TYPE_CHECKING, TextIO from ruamel import yaml @@ -20,6 +20,10 @@ from vinca.v1_selectors import evaluate_distro_selectors from vinca.variants import VariantsMode, get_recipe_variants, get_variants_mode +if TYPE_CHECKING: + # importlib.resources.abc is new in Python 3.11 + from importlib.resources.abc import Traversable + TEMPLATE = """\ # yaml-language-server: $schema=https://raw.githubusercontent.com/prefix-dev/recipe-format/main/schema.json @@ -239,7 +243,9 @@ def write_recipe(source, outputs, vinca_conf, distro, single_file: bool = True) generate_activation_scripts_for_recipe(recipe_dir) -def generate_template(template_in, template_out: TextIO, extra_globals=None) -> None: +def generate_template( + template_in: "Traversable", template_out: TextIO, extra_globals=None +) -> None: import em from vinca.config import ros_distro, skip_testing @@ -254,7 +260,7 @@ def generate_template(template_in, template_out: TextIO, extra_globals=None) -> output=template_out, options={em.RAW_OPT: True, em.BUFFERED_OPT: True} ) interpreter.updateGlobals(g) - interpreter.file(open(template_in, encoding="utf-8")) + interpreter.file(template_in.open(encoding="utf-8")) interpreter.shutdown() # It seems that rattler-build requires script to have executable permissions diff --git a/vinca/utils.py b/vinca/utils.py index 3238bf7..57b6f04 100644 --- a/vinca/utils.py +++ b/vinca/utils.py @@ -41,7 +41,7 @@ def ignore_aliases(self, data) -> bool: NoAliasRepresenter.add_representer(literal_unicode, literal_unicode_representer) -def _channel(location): +def _channel(location) -> rattler.Channel: # rattler reads a bare name as an anaconda.org channel; a single-letter scheme # is a Windows drive if len(urlsplit(location).scheme) > 1: