[15.x] Rebuild for orc 2.0.1; enable orc-on-windows also for pyarrow (#…

…1086) automerged PR by conda-forge/automerge-action
conda-forge · May 21, 2024 · 722b37b · 722b37b
2 parents cdf2726 + f8fa4c7
commit 722b37b
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 28 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...ompiler_version11c_stdlib_version2.17cuda_compiler_version11.8cxx_compiler_version11.yaml b/...ompiler_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/...ompiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml b/...ompiler_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/...er_version11.8cxx_compiler_version10.yaml → ...er_version11.8cxx_compiler_version10.yaml b/...er_version11.8cxx_compiler_version10.yaml → ...er_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/...er_versionNonecxx_compiler_version13.yaml → ...er_versionNonecxx_compiler_version13.yaml b/...er_versionNonecxx_compiler_version13.yaml → ...er_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/...rt/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml b/...rt/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/...rt/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/...rt/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
@@ -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
@@ -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
@@ -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/...ompilernvcccuda_compiler_version11.8.yaml → ...ort/win_64_cuda_compiler_version11.8.yaml b/...ompilernvcccuda_compiler_version11.8.yaml → ...ort/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/...ompilerNonecuda_compiler_versionNone.yaml → ...ort/win_64_cuda_compiler_versionNone.yaml b/...ompilerNonecuda_compiler_versionNone.yaml → ...ort/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
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ numpy: @@
     openssl:
     - '3'
     orc:
-    - 2.0.0
+    - 2.0.1
     pin_run_as_build:
       python:
         min_pin: x.x
@@ Expand Down @@