From bc7e51575192703c46023d0dacb7933c6827570a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 22 Feb 2024 08:42:21 +0000 Subject: [PATCH] Close out migration for libgrpc159_libprotobuf4244 --- recipe/conda_build_config.yaml | 11 ++++++----- .../migrations/libgrpc159_libprotobuf4244.yaml | 16 ---------------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 recipe/migrations/libgrpc159_libprotobuf4244.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index fc322f6539..2c2112e615 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -104,9 +104,8 @@ rust_compiler: macos_machine: # [osx] - x86_64-apple-darwin13.4.0 # [osx and x86_64] - arm64-apple-darwin20.0.0 # [osx and arm64] -MACOSX_DEPLOYMENT_TARGET: # [osx] - - 11.0 # [osx and arm64] - - 10.9 # [osx and x86_64] +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - "10.13" # [osx and x86_64] VERBOSE_AT: - V=1 VERBOSE_CM: @@ -505,7 +504,7 @@ libgit2: libgoogle_cloud: - '2.12' libgrpc: - - '1.58' + - "1.59" libhugetlbfs: - 2 libhwloc: @@ -545,7 +544,9 @@ libpcap: libpng: - 1.6 libprotobuf: - - 4.24.3 + - 4.24.4 +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity libpq: - '16' libraw: diff --git a/recipe/migrations/libgrpc159_libprotobuf4244.yaml b/recipe/migrations/libgrpc159_libprotobuf4244.yaml deleted file mode 100644 index 8a51b6ed31..0000000000 --- a/recipe/migrations/libgrpc159_libprotobuf4244.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.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