Skip to content
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.

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

Add missing dependencies for robot-log-visualizer #1624

Merged
merged 8 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
# Dependencies
mamba install asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json pcl vtk opencv portaudio qt-main sdl sdl2 sqlite tinyxml spdlog lua soxr cmake compilers make ninja pkg-config tomlplusplus libzlib ffmpeg onnxruntime-cpp
# Python
mamba install python numpy swig==4.1.0 pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad
mamba install python numpy swig==4.1.0 pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad pyqtwebengine qtpy pyyaml

# Additional dependencies useful only on Linux
- name: Dependencies [Conda/Linux]
Expand Down Expand Up @@ -175,6 +175,14 @@ jobs:
cd b
cmake --build . --config ${{ matrix.build_type }}

# Skip on Apple Silicon https://github.com/robotology/robotology-superbuild/issues/1625
- name: Check python metadata of installed python packages are coherent [Conda]
if: matrix.os != 'macos-14'
shell: bash -l {0}
run: |
source ./b/install/share/robotology-superbuild/setup.sh
pip check

docker-build:
name: '[docker:Tags:${{ matrix.project_tags }}@${{ matrix.docker_image }}@${{ matrix.build_type }}]'
runs-on: ubuntu-20.04
Expand Down
1 change: 1 addition & 0 deletions apt-python.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ python3-u-msgpack
python3-tornado
python3-zmq
python3-ipython
python3-yaml
libqt5multimedia5-plugins
3 changes: 3 additions & 0 deletions cmake/Buildmeshcat-python.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@

include(RobSupPurePythonYCMEPHelper)

find_or_build_package(pyngrok QUIET)

rob_sup_pure_python_ycm_ep_helper(meshcat-python
REPOSITORY rdeits/meshcat-python.git
DEPENDS pyngrok
TAG master
COMPONENT dynamics
FOLDER src
Expand Down
14 changes: 14 additions & 0 deletions cmake/Buildpyngrok.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# SPDX-FileCopyrightText: Fondazione Istituto Italiano di Tecnologia
# SPDX-License-Identifier: BSD-3-Clause

include(RobSupPurePythonYCMEPHelper)

rob_sup_pure_python_ycm_ep_helper(pyngrok
REPOSITORY alexdlaird/pyngrok.git
TAG main
COMPONENT dynamics
FOLDER src
PYTHON_PACKAGE_NAME pyngrok)

set(pyngrok_CONDA_PKG_NAME pyngrok)
set(pyngrok_CONDA_PKG_CONDA_FORGE_OVERRIDE ON)
2 changes: 1 addition & 1 deletion doc/conda-forge.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ For some [profile](doc/cmake-options.md#profile-cmake-options) or [dependency](d

To install python and the other required dependencies when using `conda-forge` provided dependencies, use:
~~~
mamba install -c conda-forge python numpy "swig==4.1.0" pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad
mamba install -c conda-forge python numpy "swig==4.1.0" pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad pyqtwebengine qtpy pyyaml
~~~

#### `ROBOTOLOGY_USES_PCL_AND_VTK`
Expand Down
4 changes: 4 additions & 0 deletions releases/latest.releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,10 @@ repositories:
type: git
url: https://github.com/pyqtconsole/pyqtconsole.git
version: v1.2.3
pyngrok:
type: git
url: https://github.com/alexdlaird/pyngrok.git
version: 7.1.6
meshcat-python:
type: git
url: https://github.com/rdeits/meshcat-python.git
Expand Down
Loading