diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 902bbdbc..cdbc94c1 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' nodejs: - '20' - '22' diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 390a6b64..351c43e4 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' nodejs: - '20' - '22' diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index bd56334c..6227eaff 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' nodejs: - '20' - '22' diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 9ac56c2e..5a795c99 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -23,7 +23,7 @@ docker_image: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' nodejs: - '20' - '22' diff --git a/.ci_support/migrations/absl_grpc_proto_25Q2.yaml b/.ci_support/migrations/absl_grpc_proto_25Q2.yaml new file mode 100644 index 00000000..10b7a095 --- /dev/null +++ b/.ci_support/migrations/absl_grpc_proto_25Q2.yaml @@ -0,0 +1,29 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20250512, libgrpc 1.73 & libprotobuf 6.31.1 + kind: version + migration_number: 1 + exclude: + # core deps + - abseil-cpp + - grpc-cpp + - libprotobuf + # required for building/testing + - protobuf + - re2 + # bazel stack + - bazel + - grpc_java_plugin + - singlejar +libabseil: +- 20250512 +libgrpc: +- "1.73" +libprotobuf: +- 6.31.1 +# we need to leave this migration open until we're ready to move the global baseline, see +# https://github.com/conda-forge/conda-forge.github.io/issues/2467; grpc 1.72 requires 11.0, +# see https://github.com/grpc/grpc/commit/f122d248443c81592e748da1adb240cbf0a0231c +c_stdlib_version: # [osx] + - 11.0 # [osx] +migrator_ts: 1748506837.6039238 diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 9aa1485f..f138a9ad 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.15' +- '11.0' MACOSX_SDK_VERSION: -- '10.15' +- '11.0' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.15' +- '11.0' channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - x86_64-apple-darwin13.4.0 nodejs: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index fb01573c..a6552477 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.15' +- '11.0' MACOSX_SDK_VERSION: -- '10.15' +- '11.0' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.15' +- '11.0' channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - x86_64-apple-darwin13.4.0 nodejs: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index f13c298b..beb0ce52 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.15' +- '11.0' MACOSX_SDK_VERSION: -- '10.15' +- '11.0' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.15' +- '11.0' channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - x86_64-apple-darwin13.4.0 nodejs: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 139f8168..e8714259 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.15' +- '11.0' MACOSX_SDK_VERSION: -- '10.15' +- '11.0' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.15' +- '11.0' channel_sources: - conda-forge channel_targets: @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - x86_64-apple-darwin13.4.0 nodejs: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 872e4f5a..90ab0a84 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - arm64-apple-darwin20.0.0 nodejs: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index b188989c..579149b5 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - arm64-apple-darwin20.0.0 nodejs: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 130a4a15..b7bd8870 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - arm64-apple-darwin20.0.0 nodejs: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 46001c15..a0a63d1e 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -23,7 +23,7 @@ cxx_compiler_version: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' macos_machine: - arm64-apple-darwin20.0.0 nodejs: diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 86daaddb..dd50ab57 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' nodejs: - '20' - '22' diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index f0e08e32..3950926d 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' nodejs: - '20' - '22' diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 87e26790..97424129 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' nodejs: - '20' - '22' diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index b24570e6..e38c20d5 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: github_actions_labels: - cirun-openstack-cpu-4xlarge libgrpc: -- '1.71' +- '1.73' nodejs: - '20' - '22' diff --git a/conda-forge.yml b/conda-forge.yml index 0d400991..01996149 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -10,7 +10,6 @@ conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main -test: native_and_emulated github_actions: self_hosted: true triggers: @@ -18,3 +17,4 @@ github_actions: - pull_request provider: linux_64: github_actions +test: native_and_emulated diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b54d919c..f6572c12 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,2 @@ -c_stdlib_version: # [osx and x86_64] -- '10.15' # [osx and x86_64] -MACOSX_SDK_VERSION: # [osx and x86_64] -- '10.15' # [osx and x86_64] github_actions_labels: - cirun-openstack-cpu-4xlarge diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c8daebfe..b87d9ce9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,7 +28,7 @@ source: - patches/0011-do-not-build-redis-openssl.patch build: - number: 0 + number: 1 # Need these up here for conda-smithy to handle them properly. requirements: