Skip to content

Commit

Permalink
Sync with noetic
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias-Fischer committed Feb 1, 2024
1 parent 63835ea commit 4b03d31
Show file tree
Hide file tree
Showing 17 changed files with 78 additions and 39 deletions.
1 change: 1 addition & 0 deletions .cirun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ runners:
preemptible: false
labels:
- cirun-linux-aarch64

1 change: 1 addition & 0 deletions .github/testpr_environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ dependencies:
- ruamel.yaml >=0.16.6,<0.18
- rosdistro >=0.8.0
- empy >=3.3.4
- networkx
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
- name: Install vinca
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ conda config --remove channels defaults
# conda config --set channel_priority strict

mamba update conda --yes --quiet -c conda-forge
mamba install --yes --quiet pip conda-build anaconda-client mamba boa
mamba install --yes --quiet pip conda-build=3.27 anaconda-client mamba boa

# setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
# export PATH="$HOME/miniconda/bin:$PATH"
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ conda activate base
conda config --set remote_max_retries 5

echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build."
mamba install -n base --quiet --yes conda-forge-ci-setup=3 conda-build pip boa quetz-client -c conda-forge
mamba install -n base --quiet --yes conda-forge-ci-setup=3 conda-build=3.27 pip boa quetz-client -c conda-forge

set -e

Expand Down
4 changes: 2 additions & 2 deletions .scripts/build_osx_arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export FEEDSTOCK_ROOT=`pwd`

echo -e "\n\nInstalling a fresh version of Miniforge."
MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download"
MINIFORGE_FILE="Mambaforge-MacOSX-x86_64.sh"
MINIFORGE_FILE="Mambaforge-MacOSX-arm64.sh"
curl -L -O --silent "${MINIFORGE_URL}/${MINIFORGE_FILE}"
/bin/bash $MINIFORGE_FILE -b

Expand All @@ -18,7 +18,7 @@ conda activate base
conda config --set remote_max_retries 5

echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build."
mamba install -n base --quiet --yes conda-forge-ci-setup=3 conda-build pip boa quetz-client -c conda-forge
mamba install -n base --quiet --yes conda-forge-ci-setup=3 conda-build=3.27 pip boa quetz-client -c conda-forge

set -e

Expand Down
5 changes: 1 addition & 4 deletions .scripts/build_win.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set "FEEDSTOCK_ROOT=%cd%"
mkdir %CONDA_BLD_PATH%
call conda index %CONDA_BLD_PATH%

call conda config --remove channels defaults
rem call conda config --remove channels defaults
call conda config --add channels conda-forge
call conda config --add channels robostack-staging
call conda config --add channels %CONDA_BLD_PATH%
Expand All @@ -40,9 +40,6 @@ reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t

:: conda remove --force m2-git

call mamba install boa
if errorlevel 1 exit 1

for %%X in (%CURRENT_RECIPES%) do (
echo "BUILDING RECIPE %%X"
cd %FEEDSTOCK_ROOT%\recipes\%%X\
Expand Down
2 changes: 1 addition & 1 deletion check_patches_clean_apply.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import shutil
import os

SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
SCRIPT_DIR = './'

shutil.move(SCRIPT_DIR + '/recipe.yaml', SCRIPT_DIR + '/recipe.yaml.bak')

Expand Down
1 change: 1 addition & 0 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ python:
python_impl:
- cpython

# Project overrides
macos_min_version: # [osx and x86_64]
- 10.14 # [osx and x86_64]
macos_machine: # [osx]
Expand Down
1 change: 0 additions & 1 deletion env/robostackenv.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: robostackenv
channels:
- robostack-humble
- robostack-staging
- conda-forge
dependencies:
Expand Down
13 changes: 13 additions & 0 deletions patch/ros-humble-nav2-mppi-controller.linux.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f0c5359d..ea9ae4374 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ set(libraries mppi_controller mppi_critics)
foreach(lib IN LISTS libraries)
target_compile_options(${lib} PUBLIC -fconcepts)
target_include_directories(${lib} PUBLIC include ${xsimd_INCLUDE_DIRS} ${OpenMP_INCLUDE_DIRS})
- target_link_libraries(${lib} xtensor xtensor::optimize xtensor::use_xsimd)
+ target_link_libraries(${lib} xtensor xtensor::use_xsimd)
ament_target_dependencies(${lib} ${dependencies_pkgs})
endforeach()

37 changes: 29 additions & 8 deletions robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,18 @@ curl:
cython:
robostack: [cython]
doxygen:
robostack: [doxygen]
robostack: [doxygen, graphviz]
draco:
robostack: [draco]
eigen:
robostack: [eigen]
emacs:
robostack: [emacs]
festival:
robostack:
linux: [festival, festvox-kallpc16k]
osx: []
win64: []
ffmpeg:
robostack: [ffmpeg]
flac:
Expand Down Expand Up @@ -234,6 +241,10 @@ libconsole-bridge-dev:
robostack: [console_bridge]
libcunit-dev:
robostack: [cunit]
libcurl:
robostack: [libcurl]
libcurl-dev:
robostack: [libcurl]
libdc1394-dev:
robostack: [libdc1394]
libfcl-dev:
Expand Down Expand Up @@ -363,7 +374,7 @@ libqglviewer-dev-qt5:
libqhull:
robostack: [qhull]
libqt5-core:
robostack: [qt-main]
robostack: [qt-main, REQUIRE_OPENGL]
libqt5-gui:
robostack: [qt-main, REQUIRE_OPENGL]
libqt5-opengl:
Expand Down Expand Up @@ -606,7 +617,7 @@ python-pygraphviz:
python-pyusb-pip:
robostack: [pyusb]
python-qt5-bindings:
robostack: [pyqt]
robostack: [pyqt, pyqt-builder]
python-rosdep:
robostack: [rosdep]
python-rosdep-modules:
Expand Down Expand Up @@ -685,6 +696,10 @@ python3-fiona:
robostack: [fiona]
python3-future:
robostack: [future]
python3-gi:
robostack: [pygobject]
python3-git:
robostack: [gitpython]
python3-github:
robostack: [pygithub]
python3-github3:
Expand Down Expand Up @@ -765,6 +780,8 @@ python3-pymongo:
robostack: [pymongo]
python3-pyproj:
robostack: [pyproj]
python3-pysnmp:
robostack: [pysnmp]
python3-pytest:
robostack: [pytest]
python3-pytest-cov:
Expand All @@ -774,9 +791,9 @@ python3-pytest-mock:
python3-pytest-timeout:
robostack: [pytest-timeout]
python3-qt5-bindings:
robostack: [pyqt]
robostack: [pyqt, pyqt-builder]
python3-qt5-bindings-gl:
robostack: [pyqt]
robostack: [pyqt, pyqt-builder]
python3-qt5-bindings-webkit:
robostack: [pyqtwebengine]
python3-requests:
Expand All @@ -797,6 +814,8 @@ python3-rospkg-modules:
robostack: [rospkg]
python3-ruamel.yaml:
robostack: [ruamel.yaml]
python3-ruff:
robostack: [ruff]
python3-scipy:
robostack: [scipy]
python3-serial:
Expand Down Expand Up @@ -827,6 +846,8 @@ python3-twisted:
robostack: [twisted]
python3-typeguard:
robostack: [typeguard]
python3-unidiff:
robostack: [unidiff]
python3-usb:
robostack: [pyusb]
python3-venv:
Expand All @@ -838,11 +859,11 @@ python3-yaml:
python3-zmq:
robostack: [pyzmq]
qt5-image-formats-plugins:
robostack: [qt-main]
robostack: [qt-main, REQUIRE_OPENGL]
qt5-qmake:
robostack: [qt-main]
robostack: [qt-main, REQUIRE_OPENGL]
qtbase5-dev:
robostack: [qt-main]
robostack: [qt-main, REQUIRE_OPENGL]
roboticstoolbox-python:
robostack: [roboticstoolbox-python]
rsync:
Expand Down
19 changes: 10 additions & 9 deletions vinca_linux_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ packages_select_by_deps:
- ros_base
- desktop
- navigation2
- moveit
- graph_msgs
- nav2_bringup
- webots_ros2
Expand Down Expand Up @@ -98,7 +97,6 @@ packages_select_by_deps:

- rqt
- rqt_image_overlay
- rqt-moveit
- rqt-robot-dashboard
- rqt-robot-monitor
- rqt-robot-steering
Expand All @@ -109,13 +107,6 @@ packages_select_by_deps:

- image-pipeline
- image-view
- moveit
- moveit-resources
- moveit-ros-perception
- moveit-runtime
- moveit-servo
- moveit_visual_tools
- moveit_servo

- bond-core
- camera-calibration
Expand All @@ -134,6 +125,16 @@ packages_select_by_deps:
- apriltag
- apriltag_ros

# - moveit
# - moveit-resources
# - moveit-ros-perception
# - moveit-runtime
# - moveit-servo
# - moveit_visual_tools
# - moveit_servo
# - rqt-moveit



# ----- end of package support -----

Expand Down
6 changes: 4 additions & 2 deletions vinca_linux_aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ packages_remove_from_deps:

skip_existing:
- https://conda.anaconda.org/robostack-staging/
# - /home/ubuntu/micromamba/envs/devenv/conda-bld/

packages_select_by_deps:
# only subset of packages to reduce maintainer load
Expand All @@ -45,8 +46,6 @@ packages_select_by_deps:
- ros_base
- desktop
- desktop_full
- moveit
- moveit_servo
- rosbag2_storage_mcap
- cartographer-ros
- foxglove_bridge
Expand Down Expand Up @@ -80,6 +79,9 @@ packages_select_by_deps:
- apriltag
- apriltag_ros

# - moveit
# - moveit_servo

# - control_toolbox
# - ros1_bridge

Expand Down
5 changes: 3 additions & 2 deletions vinca_osx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ packages_select_by_deps:
- ros_environment
- ros_base
- desktop
- moveit
- moveit_servo
- desktop_full
- navigation2
- rosbridge_suite
Expand Down Expand Up @@ -93,4 +91,7 @@ packages_select_by_deps:
- apriltag
- apriltag_ros

# - moveit
# - moveit_servo

patch_dir: patch
11 changes: 6 additions & 5 deletions vinca_osx_arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ packages_select_by_deps:
- demo_nodes_py
- demo_nodes_cpp
- desktop
- moveit
- graph_msgs
- desktop_full
- navigation2
Expand All @@ -67,7 +66,6 @@ packages_select_by_deps:
- gazebo_plugins
- gazebo_ros2_control
- gazebo_ros_pkgs

- turtlebot3_gazebo

- plotjuggler-ros
Expand All @@ -80,8 +78,11 @@ packages_select_by_deps:
- apriltag
- apriltag_ros

# - velodyne
# - sbg_driver
# - ackermann-msgs
- velodyne
- sbg_driver
- ackermann-msgs

# - moveit


patch_dir: patch
3 changes: 2 additions & 1 deletion vinca_win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ packages_select_by_deps:
- ros_environment
- ros_base
- navigation2
- moveit
- desktop_full
- desktop
- cv_bridge
Expand All @@ -62,4 +61,6 @@ packages_select_by_deps:
- rosbridge_suite
- ament_cmake_catch2

# - moveit

patch_dir: patch

0 comments on commit 4b03d31

Please sign in to comment.