Merge pull request #1146 from robotology/fix1140

Fix conda binary packages generation in releases/2022.05 branch
robotology · Jun 9, 2022 · 1308f97 · 1308f97
2 parents 307e721 + 42b93a2
commit 1308f97
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,7 +77,7 @@ jobs:
         # Compilation related dependencies 
         mamba install cmake compilers make ninja pkg-config
         # Actual dependencies
-        mamba install ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json opencv pkg-config portaudio qt=5.12.9=*_4 sdl sdl2 sqlite tinyxml spdlog lua soxr
+        mamba install ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json opencv pkg-config portaudio qt-main sdl sdl2 sqlite tinyxml spdlog lua soxr
         # Python 
         mamba install python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython
 
@@ -90,7 +90,7 @@ jobs:
         # See https://github.com/robotology/robotology-superbuild/issues/477
         mamba install bash-completion expat-cos7-x86_64 freeglut libdc1394 libi2c libselinux-cos7-x86_64 libxau-cos7-x86_64 libxcb-cos7-x86_64 libxdamage-cos7-x86_64 libxext-cos7-x86_64 libxfixes-cos7-x86_64 libxxf86vm-cos7-x86_64 mesa-libgl-cos7-x86_64 mesa-libgl-devel-cos7-x86_64 libxshmfence-cos7-x86_64 libxshmfence-devel-cos7-x86_64 
         # Ignition Gazebo
-        mamba install libignition-gazebo4
+        mamba install libignition-gazebo6
 
     # Additional dependencies useful only on Windows
     - name: Dependencies [Conda/Windows]

diff --git a/cmake/BuildICUB.cmake b/cmake/BuildICUB.cmake
@@ -94,7 +94,7 @@ ycm_ep_helper(ICUB TYPE GIT
                                     -DCREATE_LUA:BOOL=${ROBOTOLOGY_USES_LUA})
 
 # Options related to generation of conda binary packages
-set(ICUB_CONDA_DEPENDENCIES ace libopencv gsl ipopt libode qt sdl)
+set(ICUB_CONDA_DEPENDENCIES ace libopencv gsl ipopt libode qt-main sdl)
 if(NOT (APPLE OR WIN32))
   list(APPEND ICUB_CONDA_DEPENDENCIES libdc1394)
 endif()

diff --git a/cmake/BuildYARP.cmake b/cmake/BuildYARP.cmake
@@ -119,7 +119,7 @@ ycm_ep_helper(YARP TYPE GIT
                               -DENABLE_yarpmod_usbCameraRaw:BOOL=${ENABLE_USBCAMERA}
                               ${YARP_OPTIONAL_CMAKE_ARGS})
 
-set(YARP_CONDA_DEPENDENCIES ace libopencv tinyxml qt eigen sdl sdl2 sqlite libjpeg-turbo)
+set(YARP_CONDA_DEPENDENCIES ace libopencv tinyxml qt-main eigen sdl sdl2 sqlite libjpeg-turbo)
 
 if(ROBOTOLOGY_USES_PYTHON)
   list(APPEND YARP_CONDA_DEPENDENCIES swig)

diff --git a/cmake/BuildYARP_telemetry.cmake b/cmake/BuildYARP_telemetry.cmake
@@ -17,4 +17,5 @@ ycm_ep_helper(YARP_telemetry TYPE GIT
                       YARP
                       matioCpp)
 
+set(YARP_telemetry_CONDA_PKG_NAME yarp-telemetry)
 set(YARP_telemetry_CONDA_DEPENDENCIES boost-cpp libmatio)
diff --git a/cmake/Buildblocktestcore.cmake b/cmake/Buildblocktestcore.cmake
@@ -13,4 +13,4 @@ ycm_ep_helper(blocktestcore TYPE GIT
               CMAKE_CACHE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF
               DEPENDS YCM)
 
-set(blocktestcore_CONDA_DEPENDENCIES qt boost-cpp)
+set(blocktestcore_CONDA_DEPENDENCIES qt-main boost-cpp)
diff --git a/cmake/Buildevent-driven.cmake b/cmake/Buildevent-driven.cmake
@@ -14,4 +14,4 @@ ycm_ep_helper(event-driven TYPE GIT
               COMPONENT event-driven
               FOLDER src)
 
-set(event-driven_CONDA_DEPENDENCIES libopencv qt)
+set(event-driven_CONDA_DEPENDENCIES libopencv qt-main)
diff --git a/cmake/Buildicub-basic-demos.cmake b/cmake/Buildicub-basic-demos.cmake
@@ -17,4 +17,4 @@ ycm_ep_helper(icub-basic-demos TYPE GIT
                                        ICUB
                                        ICUBcontrib)
 
-set(icub-basic-demos_CONDA_DEPENDENCIES libopencv qt)
+set(icub-basic-demos_CONDA_DEPENDENCIES libopencv qt-main)
diff --git a/cmake/Buildidyntree-yarp-tools.cmake b/cmake/Buildidyntree-yarp-tools.cmake
@@ -20,4 +20,4 @@ ycm_ep_helper(idyntree-yarp-tools TYPE GIT
                          -DIDYNTREE_YARP_TOOLS_USES_QT:BOOL=ON
                          -DIDYNTREE_YARP_TOOLS_USES_QT_CHARTS:BOOL=OFF)
 
-set(idyntree-yarp-tools_CONDA_DEPENDENCIES eigen qt)
+set(idyntree-yarp-tools_CONDA_DEPENDENCIES eigen qt-main)
diff --git a/cmake/Buildyarp-device-openxrheadset.cmake b/cmake/Buildyarp-device-openxrheadset.cmake
@@ -16,4 +16,4 @@ ycm_ep_helper(yarp-device-openxrheadset TYPE GIT
               DEPENDS YARP
                       OpenXR)
 
-set(yarp-device-openxrheadset_CONDA_DEPENDENCIES glew glm)
+set(yarp-device-openxrheadset_CONDA_DEPENDENCIES glew glm glfw)
diff --git a/cmake/ProjectsTagsStable.cmake b/cmake/ProjectsTagsStable.cmake
@@ -16,6 +16,6 @@ set_tag(casadi 3.5.5.3)
 set_tag(YCM_TAG ycm-0.14)
 set_tag(YARP_TAG yarp-3.7)
 set_tag(yarp-matlab-bindings_TAG yarp-3.7)
-set_tag(gym-ignition_TAG v1.2.2)
+set_tag(gym-ignition_TAG v1.3.1)
 set_tag(YARP_telemetry_TAG v0.5.1)
 set_tag(robometry_TAG v1.0.0)
diff --git a/cmake/ProjectsTagsUnstable.cmake b/cmake/ProjectsTagsUnstable.cmake
@@ -32,5 +32,5 @@ set_tag(whole-body-controllers_TAG master)
 set_tag(OsqpEigen_TAG master)
 set_tag(YARP_telemetry_TAG v0.5.1)
 set_tag(robometry_TAG master)
-set_tag(gym-ignition_TAG v1.2.2)
+set_tag(gym-ignition_TAG v1.3.1)
 set_tag(walking-teleoperation_TAG devel)
diff --git a/conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake b/conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake
@@ -204,7 +204,9 @@ macro(generate_metametadata_file)
     # See https://conda-forge.org/docs/maintainer/knowledge_base.html?#libgl
     if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
       if("qt" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
+         "qt-main" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
          "freeglut" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
+         "glew" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
          "irrlicht" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
          "idyntree" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES)
         string(APPEND metametadata_file_contents "    require_opengl_linux: true\n")

diff --git a/conda/cmake_recipe_template/meta.yaml b/conda/cmake_recipe_template/meta.yaml
@@ -2,7 +2,7 @@
 
 package:
 {% raw %}  name: {{ name }} {% endraw %}
-  version: "{{ version.replace("v","") }}"
+  version: "{{ version.replace("v","").replace("release-","") }}"
 
 source:
   git_url: https://github.com/{{ github_repo }}.git

diff --git a/conda/conda_build_config.yml b/conda/conda_build_config.yml
@@ -9,14 +9,8 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 
-# Workaround for https://github.com/conda-forge/gazebo-feedstock/issues/119
 qt:
-  - "5.12.9=*_4"
-
-gazebo:  # [osx]
-  - '11.9' # [osx]
-
-libopencv:  # [osx]
-  - '4.5.3'  # [osx]
-
+  - 5.15
 
+qt_main:
+  - 5.15
diff --git a/conda/metapackages_recipes_template/robotology-distro-all.yaml b/conda/metapackages_recipes_template/robotology-distro-all.yaml
@@ -8,7 +8,7 @@ build:
 requirements:
   # We use run as installing robotology-distro-all should install all robotology packages
   run: {# List all packages and the version dependency. #}
-{% for pkg in robotology_all_packages %}    - {{ pkg.name }}={{ pkg.version.replace("v","") }}
+{% for pkg in robotology_all_packages %}    - {{ pkg.name }}={{ pkg.version.replace("v","").replace("release-","") }}
 {% endfor %}
 
 about:

diff --git a/conda/metapackages_recipes_template/robotology-distro.yaml b/conda/metapackages_recipes_template/robotology-distro.yaml
@@ -10,7 +10,7 @@ requirements:
   # the specified package is used if the package is installed, but
   # we do not depend explicitly on the packages
   run_constrained: {# List all packages and the version dependency. #}
-{% for pkg in robotology_all_packages %}    - {{ pkg.name }}={{ pkg.version.replace("v","") }}
+{% for pkg in robotology_all_packages %}    - {{ pkg.name }}={{ pkg.version.replace("v","").replace("release-","") }}
 {% endfor %}
 
 about:

diff --git a/doc/cmake-options.md b/doc/cmake-options.md
@@ -274,7 +274,7 @@ From the superbuild point of view, we currently do not allow enabling projects t
 Follow [the source installation with conda-forge provided dependencies](https://github.com/robotology/robotology-superbuild/blob/master/doc/conda-forge.md#source-installation) and, after creating and environment and installing the default dependencies, execute:
 
 ```bash
-conda install -c conda-forge libignition-gazebo4
+conda install -c conda-forge libignition-gazebo6
 ```
 
 #### Using official instructions

diff --git a/doc/conda-forge.md b/doc/conda-forge.md
@@ -112,7 +112,7 @@ of the robotology-superbuild.**
 Once you activated it, you can install packages in it. In particular the dependencies for the robotology-superbuild can be installed as:
 ~~~
 mamba install -c conda-forge cmake compilers make ninja pkg-config
-mamba install -c conda-forge ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json opencv pkg-config portaudio qt=5.12.9=*_4 sdl sdl2 sqlite tinyxml spdlog lua soxr
+mamba install -c conda-forge ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json opencv pkg-config portaudio qt-main sdl sdl2 sqlite tinyxml spdlog lua soxr
 ~~~
 
 If you are on **Linux**, you also need to install also the following packages:

diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml
@@ -198,7 +198,7 @@ repositories:
   gym-ignition:
     type: git
     url: https://github.com/robotology/gym-ignition.git
-    version: v1.2.1
+    version: v1.3.1
   matlab-whole-body-simulator:
     type: git
     url: https://github.com/ami-iit/matlab-whole-body-simulator.git