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

[main] Rebuild for libprotobuf 4.25.3 #1335

Merged
merged 6 commits into from
Mar 10, 2024
Merged

[main] Rebuild for libprotobuf 4.25.3 #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb477da
Rebuild for libprotobuf 4.25.3
regro-cf-autotick-bot Mar 8, 2024
4075b03
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
regro-cf-autotick-bot Mar 8, 2024
65a47a6
add migration for libgoogle-cloud 2.22
h-vetinari Mar 8, 2024
cb468f8
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
Mar 8, 2024
e2fe01e
Skip test_dateutil_tzinfo_to_string failing on Windows due to GH-40337
raulcd Mar 4, 2024
ef48261
backport patch for cython 3.0.9 compat
h-vetinari Mar 10, 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
12 changes: 6 additions & 6 deletions ...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ glog:
libabseil:
- '20240116'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
- '2.22'
libgrpc:
- '1.61'
- '1.62'
libprotobuf:
- 4.25.2
- 4.25.3
lz4_c:
- 1.9.3
numpy:
Expand All @@ -63,7 +63,7 @@ python:
- 3.8.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.06.02
- 2023.09.01
snappy:
- '1'
target_platform:
Expand All @@ -75,9 +75,9 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - libgrpc
- libprotobuf
Expand Down
12 changes: 6 additions & 6 deletions ...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ glog:
libabseil:
- '20240116'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
- '2.22'
libgrpc:
- '1.61'
- '1.62'
libprotobuf:
- 4.25.2
- 4.25.3
lz4_c:
- 1.9.3
numpy:
Expand All @@ -63,7 +63,7 @@ python:
- 3.8.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.06.02
- 2023.09.01
snappy:
- '1'
target_platform:
Expand All @@ -75,9 +75,9 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - libgrpc
- libprotobuf
Expand Down
12 changes: 6 additions & 6 deletions ...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ glog:
libabseil:
- '20240116'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
- '2.22'
libgrpc:
- '1.61'
- '1.62'
libprotobuf:
- 4.25.2
- 4.25.3
lz4_c:
- 1.9.3
numpy:
Expand All @@ -67,7 +67,7 @@ python:
- 3.8.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.06.02
- 2023.09.01
snappy:
- '1'
target_platform:
Expand All @@ -79,9 +79,9 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - libgrpc
- libprotobuf
Expand Down
12 changes: 6 additions & 6 deletions ...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ glog:
libabseil:
- '20240116'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
- '2.22'
libgrpc:
- '1.61'
- '1.62'
libprotobuf:
- 4.25.2
- 4.25.3
lz4_c:
- 1.9.3
numpy:
Expand All @@ -67,7 +67,7 @@ python:
- 3.8.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.06.02
- 2023.09.01
snappy:
- '1'
target_platform:
Expand All @@ -79,9 +79,9 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - libgrpc
- libprotobuf
Expand Down
12 changes: 6 additions & 6 deletions ...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ glog:
libabseil:
- '20240116'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
- '2.22'
libgrpc:
- '1.61'
- '1.62'
libprotobuf:
- 4.25.2
- 4.25.3
lz4_c:
- 1.9.3
numpy:
Expand All @@ -63,7 +63,7 @@ python:
- 3.8.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.06.02
- 2023.09.01
snappy:
- '1'
target_platform:
Expand All @@ -75,9 +75,9 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - libgrpc
- libprotobuf
Expand Down
12 changes: 6 additions & 6 deletions ...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ glog:
libabseil:
- '20240116'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
- '2.22'
libgrpc:
- '1.61'
- '1.62'
libprotobuf:
- 4.25.2
- 4.25.3
lz4_c:
- 1.9.3
numpy:
Expand All @@ -63,7 +63,7 @@ python:
- 3.8.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.06.02
- 2023.09.01
snappy:
- '1'
target_platform:
Expand All @@ -75,9 +75,9 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - libgrpc
- libprotobuf
Expand Down
49 changes: 27 additions & 22 deletions ...upport/migrations/libgoogle_cloud221.yaml → ...upport/migrations/libgoogle_cloud222.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,51 @@
__migrator:
build_number: 1
commit_message: Rebuild for libgoogle_cloud 2.21
commit_message: Rebuild for libgoogle_cloud 2.22
kind: version
migration_number: 1
google_cloud_cpp: # legacy setup
- '2.21'
- '2.22'
libgoogle_cloud: # legacy setup
- '2.21'
- '2.22'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_all_devel:
- '2.21'
- '2.22'
libgoogle_cloud_aiplatform_devel:
- '2.21'
- '2.22'
libgoogle_cloud_automl_devel:
- '2.21'
- '2.22'
libgoogle_cloud_bigquery_devel:
- '2.21'
- '2.22'
libgoogle_cloud_bigtable_devel:
- '2.21'
- '2.22'
libgoogle_cloud_compute_devel:
- '2.21'
- '2.22'
libgoogle_cloud_dialogflow_cx_devel:
- '2.21'
- '2.22'
libgoogle_cloud_dialogflow_es_devel:
- '2.21'
- '2.22'
libgoogle_cloud_discoveryengine_devel:
- '2.21'
- '2.22'
libgoogle_cloud_dlp_devel:
- '2.21'
- '2.22'
libgoogle_cloud_iam_devel:
- '2.21'
- '2.22'
libgoogle_cloud_oauth2_devel:
- '2.21'
- '2.22'
libgoogle_cloud_policytroubleshooter_devel:
- '2.21'
- '2.22'
libgoogle_cloud_pubsub_devel:
- '2.21'
- '2.22'
libgoogle_cloud_spanner_devel:
- '2.21'
- '2.22'
libgoogle_cloud_speech_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
migrator_ts: 1708358802.0941658
- '2.22'
# 2.22 got coupled with libprotobuf/grpc bump
libgrpc:
- '1.62'
libprotobuf:
- 4.25.3
migrator_ts: 1709602930.8528247
23 changes: 23 additions & 0 deletions .ci_support/migrations/libgrpc162_libprotobuf4253.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 libprotobuf 4.25.3
kind: version
migration_number: 1
exclude:
- abseil-cpp
- grpc-cpp
- libprotobuf
- protobuf
libgrpc:
- "1.62"
libprotobuf:
- 4.25.3
# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252;
# this ensures that this migration applies also without the previous one
libabseil:
- "20240116"
# 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: 1709522594.9193177
10 changes: 0 additions & 10 deletions .ci_support/migrations/libprotobuf4251.yaml
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ glog:
libabseil:
- '20240116'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
- '2.22'
libgrpc:
- '1.61'
- '1.62'
libprotobuf:
- 4.25.2
- 4.25.3
lz4_c:
- 1.9.3
macos_machine:
Expand All @@ -59,7 +59,7 @@ python:
- 3.8.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.06.02
- 2023.09.01
snappy:
- '1'
target_platform:
Expand Down
10 changes: 5 additions & 5 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ glog:
libabseil:
- '20240116'
libgoogle_cloud_devel:
- '2.21'
- '2.22'
libgoogle_cloud_storage_devel:
- '2.21'
- '2.22'
libgrpc:
- '1.61'
- '1.62'
libprotobuf:
- 4.25.2
- 4.25.3
lz4_c:
- 1.9.3
macos_machine:
Expand All @@ -59,7 +59,7 @@ python:
- 3.8.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.06.02
- 2023.09.01
snappy:
- '1'
target_platform:
Expand Down
Loading