From e5c03a622826fcda1ebfffcc5088231b2b22c732 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:40:14 +0000 Subject: [PATCH 1/2] Rebuild for libgrpc159_libprotobuf4244 --- .../migrations/libgrpc159_libprotobuf4244.yaml | 16 ++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libgrpc159_libprotobuf4244.yaml diff --git a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml new file mode 100644 index 0000000..8a51b6e --- /dev/null +++ b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml @@ -0,0 +1,16 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 + exclude: + # this shouldn't attempt to modify the python feedstocks + - protobuf +libgrpc: +- "1.59" +libprotobuf: +- 4.24.4 +# 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: 1698833751.21557 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bc268a8..4d80e6c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,7 @@ source: - support_protobuf_crosscompilation.patch build: - number: 2 + number: 3 outputs: - name: {{ cxx_name }} From 133bbb2947788abd92685c08bfa3819a992c385b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:40:40 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.11.02.10.11.59 --- ...python3.10.____cpythonpython_implcpython.yaml | 2 +- ...python3.11.____cpythonpython_implcpython.yaml | 2 +- ...python3.12.____cpythonpython_implcpython.yaml | 2 +- ..._python3.8.____cpythonpython_implcpython.yaml | 2 +- ..._64_python3.9.____73_pypypython_implpypy.yaml | 2 +- ..._python3.9.____cpythonpython_implcpython.yaml | 2 +- ...python3.10.____cpythonpython_implcpython.yaml | 2 +- ...python3.11.____cpythonpython_implcpython.yaml | 2 +- ...python3.12.____cpythonpython_implcpython.yaml | 2 +- ..._python3.8.____cpythonpython_implcpython.yaml | 2 +- ...h64_python3.9.____73_pypypython_implpypy.yaml | 2 +- ..._python3.9.____cpythonpython_implcpython.yaml | 2 +- .../migrations/libgrpc158_libprotobuf4243.yaml | 16 ---------------- ...python3.10.____cpythonpython_implcpython.yaml | 2 +- ...python3.11.____cpythonpython_implcpython.yaml | 2 +- ...python3.12.____cpythonpython_implcpython.yaml | 2 +- ..._python3.8.____cpythonpython_implcpython.yaml | 2 +- ..._64_python3.9.____73_pypypython_implpypy.yaml | 2 +- ..._python3.9.____cpythonpython_implcpython.yaml | 2 +- .../osx_arm64_python3.10.____cpython.yaml | 2 +- .../osx_arm64_python3.11.____cpython.yaml | 2 +- .../osx_arm64_python3.12.____cpython.yaml | 2 +- .ci_support/osx_arm64_python3.8.____cpython.yaml | 2 +- .ci_support/osx_arm64_python3.9.____cpython.yaml | 2 +- ...python3.10.____cpythonpython_implcpython.yaml | 2 +- ...python3.11.____cpythonpython_implcpython.yaml | 2 +- ...python3.12.____cpythonpython_implcpython.yaml | 2 +- ..._python3.8.____cpythonpython_implcpython.yaml | 2 +- ..._64_python3.9.____73_pypypython_implpypy.yaml | 2 +- ..._python3.9.____cpythonpython_implcpython.yaml | 2 +- 30 files changed, 29 insertions(+), 45 deletions(-) delete mode 100644 .ci_support/migrations/libgrpc158_libprotobuf4243.yaml diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml index 6bc4ad4..73ef41e 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 690b4c1..60e3f1e 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 4f6c604..6fc092f 100644 --- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index a885b7a..d858326 100644 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index dbdf45b..fcb7a70 100644 --- a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml @@ -17,7 +17,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index ee38af9..78ab394 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index cf7ad29..d08a7c5 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml @@ -21,7 +21,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 0e88c97..cd28c23 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml @@ -21,7 +21,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 7634e4b..a6dc63c 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml @@ -21,7 +21,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index e40dfae..ea833d7 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml @@ -21,7 +21,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 9d92118..a5a1642 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml @@ -21,7 +21,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 3af5719..b1eed3d 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml @@ -21,7 +21,7 @@ docker_image: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml b/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml deleted file mode 100644 index 2e4dc06..0000000 --- a/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml +++ /dev/null @@ -1,16 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - exclude: - # this shouldn't attempt to modify the python feedstocks - - protobuf -libgrpc: -- "1.58" -libprotobuf: -- 4.24.3 -# 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: 1695803907.2958245 diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml index a342bb1..e988d2c 100644 --- 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_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index b6cc4bf..2c1d446 100644 --- 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_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 0891f72..92dc953 100644 --- 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_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index ceb3517..cdb32ca 100644 --- 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_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index be4e0ea..a68c9cf 100644 --- 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_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 0e81084..086aa64 100644 --- 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_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index eb1b038..d2b974c 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 0a7f1cf..8ad5b43 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index d16f9e8..f3bd6b7 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index ca518f9..496da87 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 7285969..ca0c5f6 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 06b24c4..0bc5aad 100644 --- a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 833f8bc..b0ed723 100644 --- a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 9b9071f..aa0076c 100644 --- a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index b026dae..6d0c808 100644 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 77325f0..a611b1a 100644 --- a/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml @@ -9,7 +9,7 @@ cxx_compiler: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 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 index 3a2d976..5f6e8fb 100644 --- a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: libabseil: - '20230802' libprotobuf: -- 4.24.3 +- 4.24.4 pin_run_as_build: python: min_pin: x.x