From 80a8a8236f81df7f732913f64318ad7f8f026e31 Mon Sep 17 00:00:00 2001 From: Giovanni Fregonese Date: Tue, 26 Mar 2024 17:59:56 +0100 Subject: [PATCH 1/8] Update conda-forge.md --- doc/conda-forge.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conda-forge.md b/doc/conda-forge.md index 200bdbde5..1c1837c97 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 ~~~ #### `ROBOTOLOGY_USES_PCL_AND_VTK` From 215ff532deba7cba8c7c4df15164b5c6f4b2ea88 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 26 Mar 2024 18:23:14 +0100 Subject: [PATCH 2/8] Add pip check to conda ci to verify that all required dependencies are installed --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 981b94ef3..d35409034 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 # Additional dependencies useful only on Linux - name: Dependencies [Conda/Linux] @@ -175,6 +175,12 @@ jobs: cd b cmake --build . --config ${{ matrix.build_type }} + - name: Check python metadata of installed python packages are coherent [Conda] + 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 From 0e8b7465fe3880daf90d86687e55d2dc8c9fab78 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 27 Mar 2024 12:36:06 +0100 Subject: [PATCH 3/8] Create Buildpyngrok.cmake --- cmake/Buildpyngrok.cmake | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 cmake/Buildpyngrok.cmake diff --git a/cmake/Buildpyngrok.cmake b/cmake/Buildpyngrok.cmake new file mode 100644 index 000000000..b5f9eb9bf --- /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 master + COMPONENT dynamics + FOLDER src + PYTHON_PACKAGE_NAME pyngrok) + +set(pyngrok_CONDA_PKG_NAME pyngrok) +set(pyngrok_CONDA_PKG_CONDA_FORGE_OVERRIDE ON) From 6e8b8499b674fdf5b5d7c06831180028744f9bd2 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 27 Mar 2024 12:38:53 +0100 Subject: [PATCH 4/8] Add pyngrok metadata to meshcat-python --- cmake/Buildmeshcat-python.cmake | 3 +++ releases/latest.releases.yaml | 4 ++++ 2 files changed, 7 insertions(+) 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/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 From 187f8cc2e0c10ba65a3364bfc76b5781150b342a Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 27 Mar 2024 13:25:17 +0100 Subject: [PATCH 5/8] Fix pyngrok branch --- cmake/Buildpyngrok.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Buildpyngrok.cmake b/cmake/Buildpyngrok.cmake index b5f9eb9bf..48e2472dd 100644 --- a/cmake/Buildpyngrok.cmake +++ b/cmake/Buildpyngrok.cmake @@ -5,7 +5,7 @@ include(RobSupPurePythonYCMEPHelper) rob_sup_pure_python_ycm_ep_helper(pyngrok REPOSITORY alexdlaird/pyngrok.git - TAG master + TAG main COMPONENT dynamics FOLDER src PYTHON_PACKAGE_NAME pyngrok) From 65286df5e7176d7fd9b9f008734d8ec8846aea0f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 27 Mar 2024 13:28:19 +0100 Subject: [PATCH 6/8] Add missing pyyaml dependency for pyngrok --- .github/workflows/ci.yml | 2 +- apt-python.txt | 1 + doc/conda-forge.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d35409034..57a8fdb74 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 pyqtwebengine qtpy + 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] 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/doc/conda-forge.md b/doc/conda-forge.md index 1c1837c97..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 pyqtwebengine qtpy +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` From b6bebef57c17daa8e66c1a287ddeb4eb112fba1e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 27 Mar 2024 16:08:37 +0100 Subject: [PATCH 7/8] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57a8fdb74..92be6e653 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,7 +175,9 @@ 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: !contains(matrix.os, ' macos-14') shell: bash -l {0} run: | source ./b/install/share/robotology-superbuild/setup.sh From 4ca8b3a91b281b28c69909bc83405102f6087fed Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 27 Mar 2024 16:13:28 +0100 Subject: [PATCH 8/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92be6e653..1fcb6e907 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -177,7 +177,7 @@ jobs: # Skip on Apple Silicon https://github.com/robotology/robotology-superbuild/issues/1625 - name: Check python metadata of installed python packages are coherent [Conda] - if: !contains(matrix.os, ' macos-14') + if: matrix.os != 'macos-14' shell: bash -l {0} run: | source ./b/install/share/robotology-superbuild/setup.sh