diff --git a/additional_recipes/ros-distro-mutex/recipe.yaml b/additional_recipes/ros-distro-mutex/recipe.yaml index 1e7cd6ade..843eea1ed 100644 --- a/additional_recipes/ros-distro-mutex/recipe.yaml +++ b/additional_recipes/ros-distro-mutex/recipe.yaml @@ -37,6 +37,7 @@ requirements: - libprotobuf 5.28.2.* - ogre 1.10.12.* - libpqxx 7.8.* + - sip ==6.8.6 run_exports: weak: diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml index d1e9f43ee..674e2d66d 100644 --- a/patch/dependencies.yaml +++ b/patch/dependencies.yaml @@ -5,6 +5,7 @@ rviz: add_host: ["${{ 'setuptools 69.*' if win }}", "sip ==6.8.6"] python_qt_binding: add_run: ["adwaita-icon-theme"] + add_host: ["${{ 'setuptools 69.*' if win }}", "sip ==6.8.6"] ompl: add_host: ["ompl"] add_run: ["ompl"] diff --git a/pixi.lock b/pixi.lock index 6dd217108..b1be29cbc 100644 --- a/pixi.lock +++ b/pixi.lock @@ -88,7 +88,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/6e/264c50ce2a31473a9fdbf4fa66ca9b2b17c7455b31ef585462343818bd6c/ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@8295f8f9b0fade22fff8683f491f203d145d639c + - pypi: git+https://github.com/RoboStack/vinca.git@37b38745c4ef3792e17824ce54892ebdeecc17cb linux-aarch64: - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda @@ -170,7 +170,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3c/d2/b79b7d695e2f21da020bd44c782490578f300dd44f0a4c57a92575758a76/ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux2014_aarch64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@8295f8f9b0fade22fff8683f491f203d145d639c + - pypi: git+https://github.com/RoboStack/vinca.git@37b38745c4ef3792e17824ce54892ebdeecc17cb osx-64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -242,7 +242,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/20/84/80203abff8ea4993a87d823a5f632e4d92831ef75d404c9fc78d0176d2b5/ruamel.yaml.clib-0.2.12.tar.gz - - pypi: git+https://github.com/RoboStack/vinca.git@8295f8f9b0fade22fff8683f491f203d145d639c + - pypi: git+https://github.com/RoboStack/vinca.git@37b38745c4ef3792e17824ce54892ebdeecc17cb osx-arm64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -314,7 +314,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/fb/8f/683c6ad562f558cbc4f7c029abcd9599148c51c54b5ef0f24f2638da9fbb/ruamel.yaml.clib-0.2.12-cp311-cp311-macosx_13_0_arm64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@8295f8f9b0fade22fff8683f491f203d145d639c + - pypi: git+https://github.com/RoboStack/vinca.git@37b38745c4ef3792e17824ce54892ebdeecc17cb win-64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -394,7 +394,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/4f/b52f634c9548a9291a70dfce26ca7ebce388235c93588a1068028ea23fcc/ruamel.yaml.clib-0.2.12-cp311-cp311-win_amd64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@8295f8f9b0fade22fff8683f491f203d145d639c + - pypi: git+https://github.com/RoboStack/vinca.git@37b38745c4ef3792e17824ce54892ebdeecc17cb default: channels: - url: https://repo.prefix.dev/conda-forge/ @@ -1069,6 +1069,7 @@ packages: depends: - python >=3.9 license: MIT + license_family: MIT purls: - pkg:pypi/charset-normalizer?source=hash-mapping size: 47438 @@ -2802,7 +2803,7 @@ packages: purls: [] size: 754247 timestamp: 1731710681163 -- pypi: git+https://github.com/RoboStack/vinca.git@8295f8f9b0fade22fff8683f491f203d145d639c +- pypi: git+https://github.com/RoboStack/vinca.git@37b38745c4ef3792e17824ce54892ebdeecc17cb name: vinca version: 0.0.2 requires_dist: diff --git a/pixi.toml b/pixi.toml index f64277b4f..eb8119ab6 100644 --- a/pixi.toml +++ b/pixi.toml @@ -27,7 +27,7 @@ git = "*" [feature.beta.pypi-dependencies] # This is tipically the latest commit on rattler-build-humble branch -vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "8295f8f9b0fade22fff8683f491f203d145d639c" } +vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "37b38745c4ef3792e17824ce54892ebdeecc17cb" } # Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back # (and regenerate the pixi.lock) once you push the modified commit to the repo #vinca = { path = "../vinca", editable = true }