diff --git a/.ci_support/linux_64_cuda_compiler_version11.8.yaml b/.ci_support/linux_64_cuda_compiler_version11.8.yaml index 8d9442b8e..adf100e92 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.8.yaml @@ -69,7 +69,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - linux-64 thrift_cpp: diff --git a/.ci_support/linux_64_cuda_compiler_versionNone.yaml b/.ci_support/linux_64_cuda_compiler_versionNone.yaml index c3449b56b..096b9ccbb 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNone.yaml @@ -69,7 +69,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - linux-64 thrift_cpp: diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml index 822f1aaf3..5a0880ba3 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml @@ -73,7 +73,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - linux-aarch64 thrift_cpp: diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml index e4e8fd4b9..217ed292a 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml @@ -73,7 +73,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - linux-aarch64 thrift_cpp: diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml index 4c177b0d3..bd55efacf 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml @@ -69,7 +69,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - linux-ppc64le thrift_cpp: diff --git a/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml index 189a62ad9..5fad0d5ff 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml @@ -69,7 +69,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - linux-ppc64le thrift_cpp: diff --git a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml b/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml deleted file mode 100644 index 3781ea0c2..000000000 --- a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml +++ /dev/null @@ -1,13 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libabseil: -- 20230802 -libgrpc: -- "1.57" -libprotobuf: -- 4.23.4 -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1692632590.658328 diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml deleted file mode 100644 index 08cd5a028..000000000 --- a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml +++ /dev/null @@ -1,22 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 - kind: version - migration_number: 1 - 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 diff --git a/.ci_support/migrations/libgoogle_cloud223.yaml b/.ci_support/migrations/libgoogle_cloud223.yaml deleted file mode 100644 index 39f4e0969..000000000 --- a/.ci_support/migrations/libgoogle_cloud223.yaml +++ /dev/null @@ -1,46 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libgoogle_cloud 2.23 - kind: version - migration_number: 1 -google_cloud_cpp: - - '2.23' -libgoogle_cloud: - - '2.23' -libgoogle_cloud_devel: - - '2.23' -libgoogle_cloud_all_devel: - - '2.23' -libgoogle_cloud_aiplatform_devel: - - '2.23' -libgoogle_cloud_automl_devel: - - '2.23' -libgoogle_cloud_bigquery_devel: - - '2.23' -libgoogle_cloud_bigtable_devel: - - '2.23' -libgoogle_cloud_compute_devel: - - '2.23' -libgoogle_cloud_dialogflow_cx_devel: - - '2.23' -libgoogle_cloud_dialogflow_es_devel: - - '2.23' -libgoogle_cloud_discoveryengine_devel: - - '2.23' -libgoogle_cloud_dlp_devel: - - '2.23' -libgoogle_cloud_iam_devel: - - '2.23' -libgoogle_cloud_oauth2_devel: - - '2.23' -libgoogle_cloud_policytroubleshooter_devel: - - '2.23' -libgoogle_cloud_pubsub_devel: - - '2.23' -libgoogle_cloud_spanner_devel: - - '2.23' -libgoogle_cloud_speech_devel: - - '2.23' -libgoogle_cloud_storage_devel: - - '2.23' -migrator_ts: 1713301249.438007 diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml deleted file mode 100644 index 16b401a5b..000000000 --- a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml +++ /dev/null @@ -1,23 +0,0 @@ -__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 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 1d8233b92..7ac75284a 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -65,7 +65,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - osx-64 thrift_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 2bfd1bcef..17e109e09 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -65,7 +65,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - osx-arm64 thrift_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index ed0fc87c4..17d0b4ebe 100644 --- a/.ci_support/win_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -63,7 +63,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - win-64 thrift_cpp: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 0f324e554..559bdcdd3 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -63,7 +63,7 @@ python: re2: - 2023.09.01 snappy: -- '1.2' +- '1.1' target_platform: - win-64 thrift_cpp: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3c14d4bf6..1d44321cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,7 +34,7 @@ source: folder: testing build: - number: 38 + number: 39 # for cuda support, building with one version is enough to be compatible with # all later versions, since arrow is only using libcuda, and not libcudart. skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]