Merge pull request #212 from h-vetinari/bump

protobuf 4.25.2
conda-forge · Feb 8, 2024 · bdf27c3 · bdf27c3
2 parents 128b13c + 2ce1e97
commit bdf27c3
Show file tree

Hide file tree

Showing 38 changed files with 60 additions and 40 deletions.
diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml
@@ -0,0 +1,23 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2
+  kind: version
+  migration_number: 1
+  paused: True
+  exclude:
+    - abseil-cpp
+    - grpc-cpp
+    - libprotobuf
+    # this shouldn't attempt to modify the python feedstocks
+    - protobuf
+libabseil:
+- "20240116"
+libgrpc:
+- "1.61"
+libprotobuf:
+- 4.25.2
+# already covered by libabseil20230802_libgrpc157_libprotobuf4234,
+# which we cannot delete yet, but keep for clarity
+MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
+- "10.13"                  # [osx and x86_64]
+migrator_ts: 1705991934.9119136
diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - arm64-apple-darwin20.0.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
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 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
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:

diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:

diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libabseil:
-- '20230802'
+- '20240116'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:

diff --git a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libabseil:
-- '20230802'
+- '20240116'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,5 +1,2 @@
 MACOSX_SDK_VERSION:        # [osx and x86_64]
   - "10.13"                # [osx and x86_64]
-
-libabseil:
-  - 20230802
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 # keep this without major version to let the bot pick it up
-{% set version = "25.1" %}
+{% set version = "25.2" %}
 # protobuf doesn't add the major version in the tag, it's defined per language in
 # https://github.com/protocolbuffers/protobuf/blob/main/version.json
 {% set major = "4" %}
@@ -12,7 +12,7 @@ package:
 
 source:
   url: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v{{ version }}.tar.gz
-  sha256: 9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42
+  sha256: 8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871
   patches:
     - patches/0001-do-not-link-msvc-runtime-statically.patch
     - patches/0002-fix-paths-for-include-lib-directories.patch