diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 74bc73522..c055bb713 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,12 +16,12 @@ jobs: CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version10: - CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version10 + linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10: + CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 + linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13: + CONFIG: linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f34d3022c..7c2d21106 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.8: + CONFIG: win_64_cuda_compiler_version11.8 UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.8: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 + win_64_cuda_compiler_versionNone: + CONFIG: win_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml index 060e8407b..b78ef61e6 100644 --- a/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -55,7 +55,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml index c97571188..a8cec32ce 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -55,7 +55,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml similarity index 99% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version10.yaml rename to .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml index 9d870b2a5..6efe3753b 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10.yaml @@ -59,7 +59,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml similarity index 99% rename from .ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml rename to .ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml index 36dcbddfd..b93969643 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13.yaml @@ -59,7 +59,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index f19a56198..9bb131124 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -55,7 +55,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml index 64e453b6b..b6ff69181 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -55,7 +55,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/migrations/orc201.yaml b/.ci_support/migrations/orc201.yaml new file mode 100644 index 000000000..3dfa060a7 --- /dev/null +++ b/.ci_support/migrations/orc201.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for orc 2.0.1 + kind: version + migration_number: 1 +migrator_ts: 1716104618.410814 +orc: +- 2.0.1 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 8dada9752..ba6801e31 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -53,7 +53,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 81ed2e856..1883524df 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -53,7 +53,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml similarity index 99% rename from .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml rename to .ci_support/win_64_cuda_compiler_version11.8.yaml index 49708a053..767e6652a 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -49,7 +49,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml similarity index 99% rename from .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compiler_versionNone.yaml index 814542f96..83eadcc92 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -49,7 +49,7 @@ numpy: openssl: - '3' orc: -- 2.0.0 +- 2.0.1 pin_run_as_build: python: min_pin: x.x diff --git a/README.md b/README.md index 34517004b..bb19c5516 100644 --- a/README.md +++ b/README.md @@ -153,17 +153,17 @@ Current build status - linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version10 + linux_aarch64_c_compiler_version10cuda_compiler_version11.8cxx_compiler_version10 - variant + variant - linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 + linux_aarch64_c_compiler_version13cuda_compiler_versionNonecxx_compiler_version13 - variant + variant @@ -195,17 +195,17 @@ Current build status - win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.8 - variant + variant - win_64_cuda_compilernvcccuda_compiler_version11.8 + win_64_cuda_compiler_versionNone - variant + variant diff --git a/recipe/build-pyarrow.bat b/recipe/build-pyarrow.bat index e3eaa32bc..4605cbd39 100644 --- a/recipe/build-pyarrow.bat +++ b/recipe/build-pyarrow.bat @@ -11,6 +11,7 @@ SET PYARROW_WITH_FLIGHT=1 SET PYARROW_WITH_GANDIVA=1 SET PYARROW_WITH_GCS=1 SET PYARROW_WITH_HDFS=1 +SET PYARROW_WITH_ORC=1 SET PYARROW_WITH_PARQUET=1 SET PYARROW_WITH_PARQUET_ENCRYPTION=1 SET PYARROW_WITH_S3=1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2c7c8ed94..47408db0b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,7 +33,7 @@ source: folder: testing build: - number: 9 + number: 10 # 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)] @@ -694,6 +694,8 @@ outputs: - {{ pin_subpackage("libparquet", exact=True) }} - {{ pin_compatible('numpy') }} - python + # orc>=2.0.1 will look in $CONDA_PREFIX/share/zoneinfo + - tzdata run_constrained: - apache-arrow-proc =*={{ build_ext }} @@ -706,7 +708,7 @@ outputs: - pyarrow.compute - pyarrow.flight - pyarrow.gandiva - - pyarrow.orc # [unix] + - pyarrow.orc - pyarrow.parquet - pyarrow.fs - pyarrow._s3fs