Skip to content

Commit bc7875f

Browse files
committed
Devendor more packages thanks to version override
1 parent 1f2a850 commit bc7875f

File tree

4 files changed

+41
-9
lines changed

4 files changed

+41
-9
lines changed

pixi.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ git = "*"
2424

2525
[pypi-dependencies]
2626
# This is tipically the latest commit on main branch
27-
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "dbd4b38b28b6940f8dfd26fc3703881d7a9a2904" }
27+
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "12c56c58cb1ad53a837ef6dbb691b9e7632c73a8" }
2828
# Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
2929
# (and regenerate the pixi.lock) once you push the modified commit to the repo
3030
#vinca = { path = "../vinca", editable = true }

pkg_additional_info.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,39 @@ urdfdom:
1414
generate_dummy_package_with_run_deps:
1515
dep_name: urdfdom
1616
max_pin: 'x.x'
17+
# kilted is on 5.0.0, but we are waiting for
18+
# https://github.com/ros/urdfdom/issues/220
19+
override_version: '4.0.1'
1720
cartographer:
1821
generate_dummy_package_with_run_deps:
1922
dep_name: cartographer
2023
max_pin: 'x.x'
24+
hpp_fcl:
25+
generate_dummy_package_with_run_deps:
26+
dep_name: hpp-fcl
27+
max_pin: 'x.x.x'
28+
# the version on ros is outdated w.r.t. to the conda-forge one
29+
override_version: '3.0.1'
30+
coal:
31+
generate_dummy_package_with_run_deps:
32+
dep_name: coal
33+
max_pin: 'x.x.x'
34+
eigenpy:
35+
generate_dummy_package_with_run_deps:
36+
dep_name: eigenpy
37+
max_pin: 'x.x.x'
38+
# the version on ros is outdated w.r.t. to the conda-forge one
39+
override_version: '3.10.0'
40+
pinocchio:
41+
generate_dummy_package_with_run_deps:
42+
dep_name: pinocchio
43+
max_pin: 'x.x.x'
44+
# the version on ros is outdated w.r.t. to the conda-forge one
45+
override_version: '3.7.0'
46+
gtsam:
47+
generate_dummy_package_with_run_deps:
48+
dep_name: gtsam
49+
max_pin: 'x.x'
50+
# the version on ros is actually an alpha, not a properly released version,
51+
# see https://discourse.ros.org/t/on-new-gtsam-version-without-boost/44307
52+
override_version: '4.2.0'

vinca.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ packages_select_by_deps:
130130

131131
- behaviortree_cpp
132132

133+
- gtsam
134+
133135
# These packages are only built on Linux as they depend on Linux-specific API
134136
- if: linux
135137
then:
@@ -154,8 +156,6 @@ packages_select_by_deps:
154156
- moveit-py
155157
- moveit-ros-perception
156158
- moveit-ros-occupancy-map-monitor
157-
# todo: switch to dummy vendored package that just depends on the conda-forge's gtsam, so it works also on Windows
158-
- gtsam
159159
# TODO on windows: fix iconv link issue
160160
- ffmpeg_image_transport
161161
- apriltag_draw

0 commit comments

Comments
 (0)