diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 981b94ef3..1fcb6e907 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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] @@ -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 diff --git a/apt-python.txt b/apt-python.txt index 188a8153b..f6fce31ce 100644 --- a/apt-python.txt +++ b/apt-python.txt @@ -13,4 +13,5 @@ python3-u-msgpack python3-tornado python3-zmq python3-ipython +python3-yaml libqt5multimedia5-plugins diff --git a/cmake/Buildmeshcat-python.cmake b/cmake/Buildmeshcat-python.cmake index 1c643e4d1..ed2bbec1b 100644 --- a/cmake/Buildmeshcat-python.cmake +++ b/cmake/Buildmeshcat-python.cmake @@ -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 diff --git a/cmake/Buildpyngrok.cmake b/cmake/Buildpyngrok.cmake new file mode 100644 index 000000000..48e2472dd --- /dev/null +++ b/cmake/Buildpyngrok.cmake @@ -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) diff --git a/doc/conda-forge.md b/doc/conda-forge.md index 200bdbde5..5e4aae1c2 100644 --- a/doc/conda-forge.md +++ b/doc/conda-forge.md @@ -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` diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index 567ab4f81..a9db6d28f 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -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