From 371ac8757558cd5d994ae9b5372a52ef0946bdcf Mon Sep 17 00:00:00 2001 From: Silvio Date: Tue, 21 Jan 2025 09:07:02 +0100 Subject: [PATCH 1/6] Actually use the rosdistro snapshot --- pixi.lock | 12 ++++++------ pixi.toml | 4 ++-- ...25-01-10-12-52-27.yaml => rosdistro_snapshot.yaml | 1 + vinca_linux_64.yaml | 1 + vinca_linux_aarch64.yaml | 2 +- vinca_osx.yaml | 1 + vinca_osx_arm64.yaml | 1 + vinca_win.yaml | 1 + 8 files changed, 14 insertions(+), 9 deletions(-) rename snapshot_2025-01-10-12-52-27.yaml => rosdistro_snapshot.yaml (99%) diff --git a/pixi.lock b/pixi.lock index acaa9c0b..b65644c9 100644 --- a/pixi.lock +++ b/pixi.lock @@ -89,7 +89,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@a081fad2b1d72cfa4c3cc30010dae024ade79d0c + - pypi: git+https://github.com/RoboStack/vinca.git@cbb8eba834ce3834df552977d6b08c325a30768e 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 @@ -172,7 +172,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@a081fad2b1d72cfa4c3cc30010dae024ade79d0c + - pypi: git+https://github.com/RoboStack/vinca.git@cbb8eba834ce3834df552977d6b08c325a30768e 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 @@ -245,7 +245,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@a081fad2b1d72cfa4c3cc30010dae024ade79d0c + - pypi: git+https://github.com/RoboStack/vinca.git@cbb8eba834ce3834df552977d6b08c325a30768e 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 @@ -318,7 +318,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@a081fad2b1d72cfa4c3cc30010dae024ade79d0c + - pypi: git+https://github.com/RoboStack/vinca.git@cbb8eba834ce3834df552977d6b08c325a30768e 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 @@ -399,7 +399,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@a081fad2b1d72cfa4c3cc30010dae024ade79d0c + - pypi: git+https://github.com/RoboStack/vinca.git@cbb8eba834ce3834df552977d6b08c325a30768e default: channels: - url: https://repo.prefix.dev/conda-forge/ @@ -2826,7 +2826,7 @@ packages: purls: [] size: 754247 timestamp: 1731710681163 -- pypi: git+https://github.com/RoboStack/vinca.git@a081fad2b1d72cfa4c3cc30010dae024ade79d0c +- pypi: git+https://github.com/RoboStack/vinca.git@cbb8eba834ce3834df552977d6b08c325a30768e name: vinca version: 0.0.4 requires_dist: diff --git a/pixi.toml b/pixi.toml index a7b07f16..a3454544 100644 --- a/pixi.toml +++ b/pixi.toml @@ -27,14 +27,14 @@ git = "*" [feature.beta.pypi-dependencies] # This is tipically the latest commit on main branch -vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "a081fad2b1d72cfa4c3cc30010dae024ade79d0c" } +vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "cbb8eba834ce3834df552977d6b08c325a30768e" } # 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 } [feature.beta.tasks] generate-recipes = { cmd = "vinca -m", depends-on = ["rename-file"] } -remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" } +remove-file = { cmd = "rm vinca.yaml; rm -rf recipes; mkdir recipes" } build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing" } build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing", depends-on = ["build_additional_recipes", "generate-recipes"] } build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch/; rattler-build build --recipe ./recipes/$PACKAGE/recipe.yaml -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge", env = { PACKAGE = "ros-humble-ros-workspace" } } diff --git a/snapshot_2025-01-10-12-52-27.yaml b/rosdistro_snapshot.yaml similarity index 99% rename from snapshot_2025-01-10-12-52-27.yaml rename to rosdistro_snapshot.yaml index 6997893d..d04167bb 100644 --- a/snapshot_2025-01-10-12-52-27.yaml +++ b/rosdistro_snapshot.yaml @@ -1,3 +1,4 @@ +# Generated by vinca-snapshot on 2025-01-10-12-52-27 for distro humble aandd_ekew_driver_py: tag: release/humble/aandd_ekew_driver_py/0.0.2-3 url: https://github.com/ros2-gbp/aandd_ekew_driver_py-release.git diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml index 8af680cf..db3b7c14 100644 --- a/vinca_linux_64.yaml +++ b/vinca_linux_64.yaml @@ -547,3 +547,4 @@ packages_select_by_deps: # - osrf_testing_tools_cpp patch_dir: patch +rosdistro_snapshot: rosdistro_snapshot.yaml \ No newline at end of file diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml index 49fd3e9d..8a59f927 100644 --- a/vinca_linux_aarch64.yaml +++ b/vinca_linux_aarch64.yaml @@ -405,4 +405,4 @@ packages_select_by_deps: # - osrf_testing_tools_cpp patch_dir: patch - +rosdistro_snapshot: rosdistro_snapshot.yaml diff --git a/vinca_osx.yaml b/vinca_osx.yaml index 0d827d37..77689d13 100644 --- a/vinca_osx.yaml +++ b/vinca_osx.yaml @@ -130,3 +130,4 @@ packages_select_by_deps: - lanelet2 patch_dir: patch +rosdistro_snapshot: rosdistro_snapshot.yaml \ No newline at end of file diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml index 7fd1f440..f5e9fa40 100644 --- a/vinca_osx_arm64.yaml +++ b/vinca_osx_arm64.yaml @@ -121,3 +121,4 @@ packages_select_by_deps: patch_dir: patch +rosdistro_snapshot: rosdistro_snapshot.yaml \ No newline at end of file diff --git a/vinca_win.yaml b/vinca_win.yaml index 3d1f8537..22654780 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -244,3 +244,4 @@ packages_select_by_deps: - lanelet2 patch_dir: patch +rosdistro_snapshot: rosdistro_snapshot.yaml \ No newline at end of file From b1e6c473ad822c3b2df0cf49b6aa5c9914cfb6f4 Mon Sep 17 00:00:00 2001 From: Silvio Date: Tue, 21 Jan 2025 09:14:30 +0100 Subject: [PATCH 2/6] Update conda_build_config.yaml for new rattler-build --- conda_build_config.yaml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/conda_build_config.yaml b/conda_build_config.yaml index a1870e48..0c8a6ee8 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -9,8 +9,8 @@ spdlog: pugixml: - '1.14' -cdt_name: - - ${{ "cos7" if linux }} +cdt_name: # [linux] + - conda # [linux] python: - 3.11.* *_cpython @@ -18,18 +18,19 @@ python_impl: - cpython c_stdlib: - - ${{ "sysroot" if linux }} - - ${{ "macosx_deployment_target" if osx }} - - ${{ "vs" if win }} -c_stdlib_version: - - ${{ "2.17" if linux }} - - ${{ "10.14" if osx and x86_64 }} - - ${{ "11.0" if osx and arm64 }} -c_compiler: - - ${{ "gcc" if linux }} - - ${{ "clang" if osx }} - - ${{ "vs2019" if win }} + - sysroot # [linux] + - macosx_deployment_target # [osx] + - vs # [win] +c_stdlib_version: # [unix] + - 2.17 # [linux] + - 10.13 # [osx and x86_64] + - 11.0 # [osx and arm64] cxx_compiler: - - ${{ "gxx" if linux }} - - ${{ "clangxx" if osx }} - - ${{ "vs2019" if win }} + - gxx # [linux] + - clangxx # [osx] + - vs2019 # [win and x86_64] + - vs2022 # [win and arm64] +cxx_compiler_version: # [unix] + - 13 # [linux] + - 18 # [osx] + - vs2019 # [win] From 371cfc1c167d1f41c1a6c3b7ed985755ff7e0602 Mon Sep 17 00:00:00 2001 From: Silvio Date: Tue, 21 Jan 2025 09:14:42 +0100 Subject: [PATCH 3/6] Add twist_mux --- vinca_linux_64.yaml | 3 +++ vinca_linux_aarch64.yaml | 2 ++ vinca_osx.yaml | 3 +++ vinca_osx_arm64.yaml | 6 ++++-- vinca_win.yaml | 3 +++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml index db3b7c14..a5d874fd 100644 --- a/vinca_linux_64.yaml +++ b/vinca_linux_64.yaml @@ -178,6 +178,9 @@ packages_select_by_deps: - lanelet2 + # requested in https://github.com/RoboStack/ros-humble/issues/249 + - twist_mux + # ----- end of package support ----- # - rtabmap diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml index 8a59f927..5e0bcba7 100644 --- a/vinca_linux_aarch64.yaml +++ b/vinca_linux_aarch64.yaml @@ -107,6 +107,8 @@ packages_select_by_deps: - lanelet2 + # requested in https://github.com/RoboStack/ros-humble/issues/249 + - twist_mux # Used to work, now needs fixes # - rtabmap diff --git a/vinca_osx.yaml b/vinca_osx.yaml index 77689d13..b6f2cea9 100644 --- a/vinca_osx.yaml +++ b/vinca_osx.yaml @@ -129,5 +129,8 @@ packages_select_by_deps: - lanelet2 + # requested in https://github.com/RoboStack/ros-humble/issues/249 + - twist_mux + patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml \ No newline at end of file diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml index f5e9fa40..6d60e6e2 100644 --- a/vinca_osx_arm64.yaml +++ b/vinca_osx_arm64.yaml @@ -113,12 +113,14 @@ packages_select_by_deps: # requested in https://github.com/RoboStack/ros-humble/pull/205 - rosbag2_storage_mcap - + # Universal Robots, requested in https://github.com/RoboStack/ros-humble/issues/234, https://github.com/RoboStack/ros-humble/issues/227 and https://github.com/RoboStack/ros-humble/issues/222 - ur - - lanelet2 + - lanelet2 + # requested in https://github.com/RoboStack/ros-humble/issues/249 + - twist_mux patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml \ No newline at end of file diff --git a/vinca_win.yaml b/vinca_win.yaml index 22654780..55721ba7 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -243,5 +243,8 @@ packages_select_by_deps: - lanelet2 + # requested in https://github.com/RoboStack/ros-humble/issues/249 + - twist_mux + patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml \ No newline at end of file From 0ee01ead5fb93281791fc16687bce7692f2adcaf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 21 Jan 2025 09:17:35 +0100 Subject: [PATCH 4/6] Remove useless aarch64-specific steps --- .github/workflows/testpr.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index c646ca74..f7bf39c1 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -45,22 +45,6 @@ jobs: # git in C:\Program Files\Git\bin is used by pip install git+ dirs: 'C:\Program Files\Git\usr\bin;C:\Program Files\Git\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin' - # - shell: bash -l {0} - # if: matrix.platform == 'linux-aarch64' - # run: | - # echo "::group::Configure binfmt_misc" - # docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes - # export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - # export GIT_BRANCH="$(basename $GITHUB_REF)" - # echo "::endgroup::" - - - name: Install libgl1-mesa-dev (only for linux-aarch64) - if: matrix.platform == 'linux-aarch64' - shell: bash -l {0} - run: | - sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev libx11-dev libxi-dev libxmu-dev - # For some reason, the Strawberry perl's pkg-config is found # instead of the conda's one, so let's delete the /c/Strawberry directory # Furthermore, we also need to remove an older SDK that is used and can result in compilation problems From 9b5d51b6657e65556a40923974be1d51bc6f9546 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 21 Jan 2025 09:23:02 +0100 Subject: [PATCH 5/6] Update conda_build_config.yaml --- conda_build_config.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 0c8a6ee8..02b94261 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -17,6 +17,14 @@ python: python_impl: - cpython +c_compiler: + - gcc # [linux] + - clang # [osx] + - vs2019 # [win and x86_64] + - vs2022 # [win and arm64] +c_compiler_version: # [unix] + - 13 # [linux] + - 18 # [osx] c_stdlib: - sysroot # [linux] - macosx_deployment_target # [osx] @@ -33,4 +41,3 @@ cxx_compiler: cxx_compiler_version: # [unix] - 13 # [linux] - 18 # [osx] - - vs2019 # [win] From f20d3fb7efbba522e7e99f84dd7376ed7fab1573 Mon Sep 17 00:00:00 2001 From: Silvio Date: Tue, 21 Jan 2025 09:32:59 +0100 Subject: [PATCH 6/6] Ensure that we use a recent enough rattler-build --- pixi.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.toml b/pixi.toml index a3454544..b9ae8bfd 100644 --- a/pixi.toml +++ b/pixi.toml @@ -16,7 +16,7 @@ upload = "anaconda -t $ANACONDA_API_TOKEN upload" [dependencies] python = ">=3.11.0,<3.12" -rattler-build = ">=0.33.2" +rattler-build = ">=0.35.5" anaconda-client = ">=1.12" [target.win-64.dependencies]