From 5bbbcf48995abe8937f62afa91adfe1dfb8b71e1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 26 Feb 2024 15:49:47 +0100 Subject: [PATCH] Remove pinning of swig to 4.1.0 to workaround swig regressions --- .github/workflows/ci.yml | 2 +- conda/conda_build_config.yml | 6 ------ doc/cmake-options.md | 2 +- doc/conda-forge.md | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 981b94ef3..4a387e7fe 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 pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad # Additional dependencies useful only on Linux - name: Dependencies [Conda/Linux] diff --git a/conda/conda_build_config.yml b/conda/conda_build_config.yml index f696e0c54..55822a7a8 100644 --- a/conda/conda_build_config.yml +++ b/conda/conda_build_config.yml @@ -9,12 +9,6 @@ qt: qt_main: - 5.15 -# Workaround for: -# * https://github.com/robotology/robotology-superbuild/pull/1574#issuecomment-1898498891 -# * https://github.com/robotology/robotology-superbuild/issues/1572#issuecomment-1911740644 -swig: - - 4.1.0 - # Workaround for: # * Giulio Romualdi's problem installing icub-main with latest blf 0.18.0 # Remove once ipopt31414 migration is completed diff --git a/doc/cmake-options.md b/doc/cmake-options.md index 1a8184ba8..7fe7818f2 100644 --- a/doc/cmake-options.md +++ b/doc/cmake-options.md @@ -342,7 +342,7 @@ sudo bash ./scripts/install_apt_python_dependencies.sh #### Conda 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 +mamba install -c conda-forge python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython ~~~ ### Check the installation diff --git a/doc/conda-forge.md b/doc/conda-forge.md index 200bdbde5..0ab0dc2d6 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 pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad ~~~ #### `ROBOTOLOGY_USES_PCL_AND_VTK`