[11.0.x] Rebuild for aws_crt_cpp0201, google_cloud_cpp2101, re2202303…

…02 (#1057) automerged PR by conda-forge/automerge-action
conda-forge · May 17, 2023 · 28f2f58 · 28f2f58
2 parents 035062e + 5ede715
commit 28f2f58
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 60 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
@@ -23,7 +23,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libcrc32c:
@@ -57,7 +57,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
@@ -23,7 +23,7 @@ gflags:
 glog:
 - '0.6'
 google_cloud_cpp:
-- 2.10.0
+- 2.10.1
 libabseil:
 - '20230125'
 libcrc32c:
@@ -57,7 +57,7 @@ python:
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.02.02
+- 2023.03.02
 snappy:
 - '1'
 target_platform:

diff --git a/recipe/bld-pyarrow.bat b/recipe/bld-pyarrow.bat
@@ -2,18 +2,6 @@
 
 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

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -13,8 +13,8 @@ package:
   version: {{ version }}
 
 source:
-  - url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz
-    sha256: 2dd8f0ea0848a58785628ee3a57675548d509e17213a2f5d72b0d900b43f5430
+  - url: https://github.com/apache/arrow/archive/refs/tags/apache-arrow-{{ version }}.tar.gz
+    sha256: 4a8c0c3d5b39ca81f4a636a41863f1cf5e0ed199f994bf5ead0854ca037eb741
     patches:
       # gdb-integration needs full path to shared library, see
       # https://github.com/apache/arrow/blob/master/docs/source/cpp/gdb.rst#manual-loading
@@ -37,7 +37,7 @@ source:
     folder: testing
 
 build:
-  number: 19
+  number: 20
   # 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)]