From 08b5bc0c76f99845c951938ef5641ba256b307d2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 10 Jun 2023 22:02:49 +1100 Subject: [PATCH 1/5] also enable orc-on-win with pyarrow --- recipe/build-pyarrow.bat | 1 + recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 4810088cc..c9c87693f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -276,7 +276,7 @@ outputs: - pyarrow.dataset - pyarrow.flight - pyarrow.gandiva - - pyarrow.orc # [unix] + - pyarrow.orc - pyarrow.parquet - pyarrow.fs - pyarrow._s3fs From 03d6bdf06f79782e2374846efb44bf2ad0e128d0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 05:23:04 +1100 Subject: [PATCH 2/5] require tzdata for pyarrow --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c9c87693f..092fb8eb0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -265,6 +265,8 @@ outputs: - {{ pin_subpackage('libarrow', 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 }} From 787e5b2eb99a7be7e6c50394089a1722ca8a7ffc Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 May 2024 11:55:20 +1100 Subject: [PATCH 3/5] add migration for orc 2.0.1 --- .ci_support/migrations/orc201.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .ci_support/migrations/orc201.yaml 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 From c67d74fccd6bedf360bf63f70923495c390da337 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 May 2024 12:26:37 +1100 Subject: [PATCH 4/5] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 092fb8eb0..a41f1df8b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,7 +34,7 @@ source: folder: testing build: - number: 40 + number: 41 # 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)] From 1e7ba9d34e0d4aaebb882a9a48f237d84874414a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 May 2024 12:33:34 +1100 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.21.00.48.30 --- .ci_support/linux_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/linux_64_cuda_compiler_versionNone.yaml | 2 +- .ci_support/linux_aarch64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/linux_aarch64_cuda_compiler_versionNone.yaml | 2 +- .ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml | 2 +- .ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_cuda_compiler_version11.8.yaml | 2 +- .ci_support/win_64_cuda_compiler_versionNone.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ci_support/linux_64_cuda_compiler_version11.8.yaml b/.ci_support/linux_64_cuda_compiler_version11.8.yaml index 060e8407b..b78ef61e6 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.8.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.8.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_cuda_compiler_versionNone.yaml b/.ci_support/linux_64_cuda_compiler_versionNone.yaml index c97571188..a8cec32ce 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNone.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_cuda_compiler_version11.8.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml index 393dfd8ff..caaa10c52 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.8.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_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml index cd86ff73d..e45a6ce0e 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNone.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_cuda_compiler_version11.8.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml index f19a56198..9bb131124 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.8.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_cuda_compiler_versionNone.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml index 64e453b6b..b6ff69181 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_versionNone.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/osx_64_.yaml b/.ci_support/osx_64_.yaml index 2cbfc1da0..9617afd2c 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 27812b0f7..82b473cc0 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_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml index 49708a053..767e6652a 100644 --- a/.ci_support/win_64_cuda_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_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index 814542f96..83eadcc92 100644 --- a/.ci_support/win_64_cuda_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