Merge pull request #1053 from regro-cf-autotick-bot/rebuild-aws_crt_c…

…pp0201-0-1_hf82ccc [main] Rebuild for aws_crt_cpp0201, google_cloud_cpp2101, re220230302
conda-forge · May 24, 2023 · 9a85508 · 9a85508
2 parents 282ec85 + c0c21eb
commit 9a85508
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 68 deletions.
diff --git a/.ci_support/linux_64_cuda_compiler_version10.2.yaml b/.ci_support/linux_64_cuda_compiler_version10.2.yaml
@@ -1,5 +1,5 @@
 aws_crt_cpp:
-- 0.19.9
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -33,7 +33,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libevent:
@@ -63,7 +63,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/linux_64_cuda_compiler_versionNone.yaml b/.ci_support/linux_64_cuda_compiler_versionNone.yaml
@@ -1,5 +1,5 @@
 aws_crt_cpp:
-- 0.19.9
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -33,7 +33,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libevent:
@@ -63,7 +63,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml
@@ -1,7 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
 aws_crt_cpp:
-- 0.19.9
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -37,7 +37,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libevent:
@@ -67,7 +67,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml
@@ -1,7 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
 aws_crt_cpp:
-- 0.19.9
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -37,7 +37,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libevent:
@@ -67,7 +67,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml
@@ -1,5 +1,5 @@
 aws_crt_cpp:
-- 0.19.9
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -33,7 +33,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libevent:
@@ -63,7 +63,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml
@@ -1,5 +1,5 @@
 aws_crt_cpp:
-- 0.19.9
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -33,7 +33,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libevent:
@@ -63,7 +63,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/migrations/aws_crt_cpp0199.yaml → .ci_support/migrations/aws_crt_cpp0201.yaml b/.ci_support/migrations/aws_crt_cpp0199.yaml → .ci_support/migrations/aws_crt_cpp0201.yaml
@@ -4,5 +4,5 @@ __migrator:
   migration_number: 1
   automerge: true
 aws_crt_cpp:
-- 0.19.9
-migrator_ts: 1681351899.8346841
+- 0.20.1
+migrator_ts: 1683011069.5020337
diff --git a/...pport/migrations/libgoogle_cloud2100.yaml → ...pport/migrations/libgoogle_cloud2101.yaml b/...pport/migrations/libgoogle_cloud2100.yaml → ...pport/migrations/libgoogle_cloud2101.yaml
@@ -3,7 +3,7 @@ __migrator:
   kind: version
   migration_number: 1
 libgoogle_cloud:
-- 2.10.0
+- 2.10.1
 google_cloud_cpp:
-- 2.10.0
-migrator_ts: 1683064486.2253776
+- 2.10.1
+migrator_ts: 1683180056.1050766
diff --git a/.ci_support/migrations/libgoogle_cloud291.yaml b/.ci_support/migrations/libgoogle_cloud291.yaml
diff --git a/.ci_support/migrations/libevent2112.yaml → .ci_support/migrations/re220230302.yaml b/.ci_support/migrations/libevent2112.yaml → .ci_support/migrations/re220230302.yaml
@@ -2,6 +2,6 @@ __migrator:
   build_number: 1
   kind: version
   migration_number: 1
-libevent:
-- 2.1.12
-migrator_ts: 1682629086.7193437
+migrator_ts: 1677711346.116376
+re2:
+- 2023.03.02
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 aws_crt_cpp:
-- 0.19.9
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libevent:
@@ -59,7 +59,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
 aws_crt_cpp:
-- 0.19.9
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -27,7 +27,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libevent:
@@ -59,7 +59,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml
@@ -1,3 +1,5 @@
+aws_crt_cpp:
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -23,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libcrc32c:
@@ -57,7 +59,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml
@@ -1,3 +1,5 @@
+aws_crt_cpp:
+- 0.20.1
 aws_sdk_cpp:
 - 1.10.57
 bzip2:
@@ -23,7 +25,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libcrc32c:
@@ -57,7 +59,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/recipe/bld-arrow.bat → recipe/build-arrow.bat b/recipe/bld-arrow.bat → recipe/build-arrow.bat
diff --git a/recipe/bld-pyarrow.bat → recipe/build-pyarrow.bat b/recipe/bld-pyarrow.bat → recipe/build-pyarrow.bat
@@ -2,21 +2,10 @@
 
 pushd "%SRC_DIR%"\python
 
-@rem the symlinks for cmake modules don't work here
-del cmake_modules\BuildUtils.cmake
-del cmake_modules\SetupCxxFlags.cmake
-del cmake_modules\CompilerInfo.cmake
-del cmake_modules\FindNumPy.cmake
-del cmake_modules\FindPythonLibsNew.cmake
-copy /Y "%SRC_DIR%\cpp\cmake_modules\BuildUtils.cmake" cmake_modules\
-copy /Y "%SRC_DIR%\cpp\cmake_modules\SetupCxxFlags.cmake" cmake_modules\
-copy /Y "%SRC_DIR%\cpp\cmake_modules\CompilerInfo.cmake" cmake_modules\
-copy /Y "%SRC_DIR%\cpp\cmake_modules\FindNumPy.cmake" cmake_modules\
-copy /Y "%SRC_DIR%\cpp\cmake_modules\FindPythonLibsNew.cmake" cmake_modules\
-
 SET ARROW_HOME=%LIBRARY_PREFIX%
 SET SETUPTOOLS_SCM_PRETEND_VERSION=%PKG_VERSION%
 SET PYARROW_BUILD_TYPE=release
+SET PYARROW_WITH_ACERO=1
 SET PYARROW_WITH_DATASET=1
 SET PYARROW_WITH_FLIGHT=1
 SET PYARROW_WITH_GANDIVA=1

diff --git a/recipe/build-pyarrow.sh b/recipe/build-pyarrow.sh
@@ -6,6 +6,7 @@ export ARROW_HOME=$PREFIX
 export PARQUET_HOME=$PREFIX
 export SETUPTOOLS_SCM_PRETEND_VERSION=$PKG_VERSION
 export PYARROW_BUILD_TYPE=release
+export PYARROW_WITH_ACERO=1
 export PYARROW_WITH_DATASET=1
 export PYARROW_WITH_FLIGHT=1
 export PYARROW_WITH_GANDIVA=1