Merge pull request #51 from traversaro/rebuildprotobuf

Manually apply "Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5" migration and add yum dependencies to run EGL-based tests
conda-forge · Oct 2, 2024 · 86cb931 · 86cb931
2 parents f6af075 + 2dd153f
commit 86cb931
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 35 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml
@@ -17,11 +17,11 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-alma-x86_64:8
 libabseil:
-- '20240116'
+- '20240722'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml
@@ -17,11 +17,11 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-alma-x86_64:8
 libabseil:
-- '20240116'
+- '20240722'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml
@@ -23,9 +23,9 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20240116'
+- '20240722'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml
@@ -23,9 +23,9 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20240116'
+- '20240722'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml
@@ -19,9 +19,9 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20240116'
+- '20240722'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml
@@ -19,9 +19,9 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20240116'
+- '20240722'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml
@@ -0,0 +1,18 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5
+  kind: version
+  migration_number: 1
+  exclude:
+    - abseil-cpp
+    - grpc-cpp
+    - libprotobuf
+    - protobuf
+    - re2
+libabseil:
+- 20240722
+libgrpc:
+- "1.65"
+libprotobuf:
+- 5.27.5
+migrator_ts: 1727040240.8650293
diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml
@@ -19,11 +19,11 @@ cxx_compiler:
 cxx_compiler_version:
 - '17'
 libabseil:
-- '20240116'
+- '20240722'
 libarchive:
 - '3.7'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml
@@ -19,11 +19,11 @@ cxx_compiler:
 cxx_compiler_version:
 - '17'
 libabseil:
-- '20240116'
+- '20240722'
 libarchive:
 - '3.7'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml
@@ -19,11 +19,11 @@ cxx_compiler:
 cxx_compiler_version:
 - '17'
 libabseil:
-- '20240116'
+- '20240722'
 libarchive:
 - '3.7'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:

diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml
@@ -19,11 +19,11 @@ cxx_compiler:
 cxx_compiler_version:
 - '17'
 libabseil:
-- '20240116'
+- '20240722'
 libarchive:
 - '3.7'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:

diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml
@@ -9,9 +9,9 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20240116'
+- '20240722'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml
@@ -9,9 +9,9 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20240116'
+- '20240722'
 libprotobuf:
-- 4.25.3
+- 5.27.5
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -16,3 +16,7 @@ python_impl:
 numpy:
   # part of a zip_keys: python, python_impl, numpy
   - 1.23
+
+
+docker_image:                                       # [linux64]
+  - quay.io/condaforge/linux-anvil-alma-x86_64:8    # [linux64]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -15,7 +15,7 @@ source:
     sha256: de4072ad372db6c3f511ff4534410767fb0def1972d83c8894e0ee794358a5ec
 
 build:
-  number: 3
+  number: 4
 
 outputs:
   - name: {{ cxx_name }}

diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt
@@ -1,6 +1,2 @@
-mesa-libGL
+mesa-libEGL
 mesa-dri-drivers
-libselinux
-libXdamage
-libXxf86vm
-libXext