Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

protobuf 4.25.2 #212

Merged
merged 4 commits into from
Feb 8, 2024
Merged

protobuf 4.25.2 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a5491b
protobuf 4.25.2
h-vetinari Feb 8, 2024
a76793d
manually add abseil migration
h-vetinari Feb 8, 2024
ed2c7f7
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
h-vetinari Feb 8, 2024
2ce1e97
delete obsolete abseil pin
h-vetinari Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_python3.9.____73_pypypython_implpypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 23 additions & 0 deletions .ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libabseil:
- '20230802'
- '20240116'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libabseil:
- '20230802'
- '20240116'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libabseil:
- '20230802'
- '20240116'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libabseil:
- '20230802'
- '20240116'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libabseil:
- '20230802'
- '20240116'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20230802'
- '20240116'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20230802'
- '20240116'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20230802'
- '20240116'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20230802'
- '20240116'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20230802'
- '20240116'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20230802'
- '20240116'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
3 changes: 0 additions & 3 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
MACOSX_SDK_VERSION: # [osx and x86_64]
- "10.13" # [osx and x86_64]

libabseil:
- 20230802
4 changes: 2 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}
Expand All @@ -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
Expand Down