Skip to content

Feature: sort files for easier compare #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Timple wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feature: sort files for easier compare #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/testpr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ jobs:
with:
frozen: true

- name: Check sorting
if: matrix.platform == 'linux-64'
shell: bash -l {0}
run: |
pixi run sort --check

- name: Long paths workarounds for win-64
shell: bash -l {0}
if: matrix.platform == 'win-64'
Expand Down
7,957 changes: 3,992 additions & 3,965 deletions pixi.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ m2-patch = "*"
git = "*"

[pypi-dependencies]
# This is tipically the latest commit on main branch
vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "7c7eae932c4e2e1baca94540a079723c7c5ac217" }
# This is typically the latest commit on main branch
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "5104cd9" }
# 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 }
Expand All @@ -38,6 +38,7 @@ check-patches = { cmd = "python check_patches_clean_apply.py", depends-on = ["ge
create_snapshot = { cmd = "vinca-snapshot -d jazzy -o rosdistro_snapshot.yaml" }
upload = "rattler-build upload anaconda -o robostack-jazzy -a $ANACONDA_API_TOKEN"
build_continue_on_failure = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c https://prefix.dev/robostack-jazzy -c https://prefix.dev/conda-forge --continue-on-failure --skip-existing", depends-on = ["generate-recipes"] }
sort = { cmd = "vinca-sort-vinca-lists {{ check }} vinca.yaml && vinca-sort-yaml-keys {{ check }} pkg_additional_info.yaml robostack.yaml rosdistro_additional_recipes.yaml", args = [{ arg = "check", default = "" }] }

[tasks.build]
cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c https://prefix.dev/robostack-jazzy -c https://prefix.dev/conda-forge --skip-existing"
Expand Down
214 changes: 107 additions & 107 deletions pkg_additional_info.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,43 @@
libcamera:
generate_dummy_package_with_run_deps:
dep_name: libcamera
# see https://git.libcamera.org/libcamera/libcamera.git/tree/meson.build?h=v0.5.1#n65
max_pin: 'x.x'
# jazzy is on 0.3.0, but we stick to 0.5.0 for compat with the rest of conda-forge
override_version: '0.5.0'
octomap:
generate_dummy_package_with_run_deps:
dep_name: octomap
max_pin: 'x.x'
magic_enum:
generate_dummy_package_with_run_deps:
dep_name: magic_enum
max_pin: 'x.x'
ompl:
generate_dummy_package_with_run_deps:
dep_name: ompl
max_pin: 'x.x'
urdfdom_py:
generate_dummy_package_with_run_deps:
dep_name: urdfdom-py
max_pin: 'x.x'
urdfdom_headers:
generate_dummy_package_with_run_deps:
dep_name: urdfdom_headers
max_pin: 'x.x'
override_version: '3.0'
urdfdom:
apriltag:
generate_dummy_package_with_run_deps:
dep_name: urdfdom
max_pin: 'x.x'
override_version: '6.0'
dep_name: apriltag
max_pin: 'x.x.x'
aws_sdk_cpp_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
cartographer:
generate_dummy_package_with_run_deps:
dep_name: cartographer
max_pin: 'x.x'
# ROS uses a custom versioning scheme currently at 2.0.9004
override_version: '2.0.0'
hpp_fcl:
generate_dummy_package_with_run_deps:
dep_name: hpp-fcl
max_pin: 'x.x.x'
# the version on ros is outdated w.r.t. to the conda-forge one
override_version: '3.0.2'
cartographer_ros:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
coal:
generate_dummy_package_with_run_deps:
dep_name: coal
max_pin: 'x.x.x'
override_version: '3.0.3'
console_bridge_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
data_tamer_cpp:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
diagnostic_aggregator:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
diagnostic_updater:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
eigenpy:
generate_dummy_package_with_run_deps:
dep_name: eigenpy
max_pin: 'x.x.x'
override_version: '3.13.0'
pinocchio:
generate_dummy_package_with_run_deps:
dep_name: pinocchio
max_pin: 'x.x.x'
# the version on ros is outdated w.r.t. to the conda-forge one
override_version: '4.0.0'
foxglove_bridge:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
gtsam:
generate_dummy_package_with_run_deps:
dep_name: gtsam
max_pin: 'x.x'
# jazzy is on 4.2.0, but we stick to 4.2.1 for compat with the rest of conda-forge
override_version: '4.2.1'
librealsense2:
generate_dummy_package_with_run_deps:
dep_name: librealsense
max_pin: 'x.x'
ignition_cmake2_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
ignition_math6_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
libcurl_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
gz_cmake_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
gz_common_vendor:
Expand Down Expand Up @@ -105,86 +68,123 @@ gz_transport_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
gz_utils_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
sdformat_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
spdlog_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
console_bridge_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
zenoh_cpp_vendor:
hpp_fcl:
generate_dummy_package_with_run_deps:
dep_name: hpp-fcl
max_pin: 'x.x.x'
# the version on ros is outdated w.r.t. to the conda-forge one
override_version: '3.0.2'
ignition_cmake2_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
openvdb_vendor:
build_number: 19
ignition_math6_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
sqlite3_vendor:
imu_complementary_filter:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
imu_tools:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
lanelet2_projection:
additional_cmake_args: "-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_EXTENSIONS=OFF"
lanelet2_python:
additional_cmake_args: "-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_EXTENSIONS=OFF"
libcamera:
generate_dummy_package_with_run_deps:
dep_name: libcamera
# see https://git.libcamera.org/libcamera/libcamera.git/tree/meson.build?h=v0.5.1#n65
max_pin: 'x.x'
# jazzy is on 0.3.0, but we stick to 0.5.0 for compat with the rest of conda-forge
override_version: '0.5.0'
libcurl_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
liblz4_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
aws_sdk_cpp_vendor:
librealsense2:
generate_dummy_package_with_run_deps:
dep_name: librealsense
max_pin: 'x.x'
magic_enum:
generate_dummy_package_with_run_deps:
dep_name: magic_enum
max_pin: 'x.x'
mujoco_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
octomap:
generate_dummy_package_with_run_deps:
dep_name: octomap
max_pin: 'x.x'
octomap_ros:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
ompl:
generate_dummy_package_with_run_deps:
dep_name: ompl
max_pin: 'x.x'
orocos_kdl_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
pybind11_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR"
ouster_ros:
additional_cmake_args: "-DOUSTER_USE_VCPKG_IF_AVAILABLE=OFF"
pcl_ros:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
pinocchio:
generate_dummy_package_with_run_deps:
dep_name: pinocchio
max_pin: 'x.x.x'
# the version on ros is outdated w.r.t. to the conda-forge one
override_version: '4.0.0'
pybind11_json_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR"
pybind11_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR"
robot_state_publisher:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
rviz_ogre_vendor:
additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
# Remove once https://github.com/PickNikRobotics/data_tamer/pull/58 is merged and released
sdformat_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
sick_scan_xd:
additional_cmake_args: "-DBUILD_DEBUG_TARGET:BOOL=OFF -DROS_VERSION=2"
mujoco_vendor:
spdlog_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
sqlite3_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
uncrustify_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
urdfdom:
generate_dummy_package_with_run_deps:
dep_name: urdfdom
max_pin: 'x.x'
override_version: '6.0'
urdfdom_headers:
generate_dummy_package_with_run_deps:
dep_name: urdfdom_headers
max_pin: 'x.x'
override_version: '3.0'
urdfdom_py:
generate_dummy_package_with_run_deps:
dep_name: urdfdom-py
max_pin: 'x.x'
visp:
generate_dummy_package_with_run_deps:
dep_name: visp
max_pin: 'x.x'
# the version on ros is outdated w.r.t. to the conda-forge one
override_version: '3.6.0'
pcl_ros:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
cartographer_ros:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
diagnostic_aggregator:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
diagnostic_updater:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
octomap_ros:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
rviz_ogre_vendor:
additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
# Remove once https://github.com/PickNikRobotics/data_tamer/pull/58 is merged and released
data_tamer_cpp:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
foxglove_bridge:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
lanelet2_projection:
additional_cmake_args: "-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_EXTENSIONS=OFF"
lanelet2_python:
additional_cmake_args: "-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_EXTENSIONS=OFF"
robot_state_publisher:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
imu_tools:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
imu_complementary_filter:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
uncrustify_vendor:
zenoh_cpp_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
ament_index_cpp:
build_number: 19
openvdb_vendor:
build_number: 19
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
apriltag:
generate_dummy_package_with_run_deps:
dep_name: apriltag
max_pin: 'x.x.x'
ouster_ros:
additional_cmake_args: "-DOUSTER_USE_VCPKG_IF_AVAILABLE=OFF"
py_trees:
generate_dummy_package_with_run_deps:
dep_name: py-trees
max_pin: 'x.x.x'
override_version: '2.5.0'
build_number: 19
# Remove everything after this line on a full rebuild
ament_index_cpp:
realtime_tools:
build_number: 19
turtlebot4_node:
build_number: 20
turtlebot4_gz_toolbox:
build_number: 20
realtime_tools:
build_number: 19
turtlebot4_node:
build_number: 20
Loading
Loading