diff --git a/.ci_support/linux_64_cuda_compiler_version10.2.yaml b/.ci_support/linux_64_cuda_compiler_version10.2.yaml index b6a0e2b0c..e135017bb 100644 --- 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 index a3f639abb..08590f860 100644 --- 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 index 60fabde76..3853add25 100644 --- 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 index a381b3454..ef7926350 100644 --- 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 index 2a1ef7472..eef7acde2 100644 --- 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 index 24ab94206..b9bdd01b3 100644 --- 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 b/.ci_support/migrations/aws_crt_cpp0201.yaml similarity index 70% rename from .ci_support/migrations/aws_crt_cpp0199.yaml rename to .ci_support/migrations/aws_crt_cpp0201.yaml index cab84c43b..92e17d7f0 100644 --- a/.ci_support/migrations/aws_crt_cpp0199.yaml +++ b/.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/.ci_support/migrations/libgoogle_cloud2100.yaml b/.ci_support/migrations/libgoogle_cloud2101.yaml similarity index 67% rename from .ci_support/migrations/libgoogle_cloud2100.yaml rename to .ci_support/migrations/libgoogle_cloud2101.yaml index d06f37101..5b41e8c45 100644 --- a/.ci_support/migrations/libgoogle_cloud2100.yaml +++ b/.ci_support/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 deleted file mode 100644 index 82593a525..000000000 --- a/.ci_support/migrations/libgoogle_cloud291.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libgoogle_cloud: -- 2.9.1 -google_cloud_cpp: -- 2.9.1 -migrator_ts: 1682629098.5266643 diff --git a/.ci_support/migrations/libevent2112.yaml b/.ci_support/migrations/re220230302.yaml similarity index 57% rename from .ci_support/migrations/libevent2112.yaml rename to .ci_support/migrations/re220230302.yaml index f4f84a946..0b87bccbd 100644 --- a/.ci_support/migrations/libevent2112.yaml +++ b/.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 index 01febd0c1..077467977 100644 --- 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 index f10ff0098..bd834a4b6 100644 --- 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 index 4d6186768..dc1c64446 100644 --- 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 index 93656e266..e9dee6a0e 100644 --- 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 b/recipe/build-arrow.bat similarity index 100% rename from recipe/bld-arrow.bat rename to recipe/build-arrow.bat diff --git a/recipe/bld-pyarrow.bat b/recipe/build-pyarrow.bat similarity index 58% rename from recipe/bld-pyarrow.bat rename to recipe/build-pyarrow.bat index 1e99e8710..e3eaa32bc 100644 --- a/recipe/bld-pyarrow.bat +++ b/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 index 14c67ede6..e0c3ae96b 100644 --- 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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 11d828b39..6802167a0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ source: folder: testing build: - number: 1 + number: 2 # 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)] @@ -58,8 +58,8 @@ outputs: - exit 0 - name: libarrow - script: build-arrow.sh # [not win] - script: bld-arrow.bat # [win] + script: build-arrow.sh # [unix] + script: build-arrow.bat # [win] version: {{ version }} build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} @@ -93,7 +93,7 @@ outputs: # https://github.com/apache/arrow/blob/apache-arrow-11.0.0/cpp/cmake_modules/ThirdpartyToolchain.cmake#L46-L75 - clangdev {{ llvm_version }} - llvmdev {{ llvm_version }} - - aws-crt-cpp # [unix] + - aws-crt-cpp - aws-sdk-cpp - boost-cpp >=1.70 - brotli @@ -135,6 +135,8 @@ outputs: - cudatoolkit >={{ cuda_compiler_version_min }} # [cuda_compiler_version != "None"] # make sure we don't co-install with old version of old package name - arrow-cpp ={{ version }} + # old parquet lib output, now part of this feedstock + - parquet-cpp <0.0a0 test: commands: @@ -199,8 +201,8 @@ outputs: - exit 0 - name: pyarrow - script: build-pyarrow.sh # [not win] - script: bld-pyarrow.bat # [win] + script: build-pyarrow.sh # [unix] + script: build-pyarrow.bat # [win] version: {{ version }} build: string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} @@ -239,8 +241,6 @@ outputs: run: - {{ pin_subpackage('libarrow', exact=True) }} - {{ pin_compatible('numpy') }} - # empty parquet-cpp metapackage, force old versions to be uninstalled - - parquet-cpp 1.5.1.* - python run_constrained: - apache-arrow-proc =*={{ build_ext }} @@ -291,8 +291,8 @@ outputs: summary: Python libraries for Apache Arrow - name: pyarrow-tests - script: build-pyarrow.sh # [not win] - script: bld-pyarrow.bat # [win] + script: build-pyarrow.sh # [unix] + script: build-pyarrow.bat # [win] version: {{ version }} build: string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} @@ -390,7 +390,7 @@ outputs: # test is broken; header is in $PREFIX, not $SP_DIR {% set tests_to_skip = tests_to_skip + " or (test_misc and test_get_include)" %} # [unix] # ^^^^^^^ TESTS THAT SHOULDN'T HAVE TO BE SKIPPED ^^^^^^^ - - pytest -v -rfEs -k "not ({{ tests_to_skip }})" + - pytest -rfEs -k "not ({{ tests_to_skip }})" about: home: http://github.com/apache/arrow