Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.x] Rebuild for orc 2.0.1; enable orc-on-windows also for pyarrow #1419

Merged
merged 5 commits into from
May 21, 2024
Merged

[14.x] Rebuild for orc 2.0.1; enable orc-on-windows also for pyarrow #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98f58fc
also enable orc-on-win with pyarrow
h-vetinari Jun 10, 2023
9a8d296
require tzdata for pyarrow
h-vetinari May 15, 2024
f2d5958
add migration for orc 2.0.1
h-vetinari May 21, 2024
79a6b86
bump build number
h-vetinari May 21, 2024
36fddf5
MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and co…
h-vetinari May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...er_version11.8cxx_compiler_version11.yaml → ...er_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion ...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion ...er_version11.8cxx_compiler_version10.yaml → ...er_version11.8cxx_compiler_version10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ numpy:
openssl:
- '3'
orc:
- 2.0.0
- 2.0.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion ...er_versionNonecxx_compiler_version13.yaml → ...er_versionNonecxx_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ numpy:
openssl:
- '3'
orc:
- 2.0.0
- 2.0.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion ...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion ...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff 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
8 changes: 8 additions & 0 deletions .ci_support/migrations/orc201.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ numpy:
openssl:
- '3'
orc:
- 2.0.0
- 2.0.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ numpy:
openssl:
- '3'
orc:
- 2.0.0
- 2.0.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
openssl:
- '3'
orc:
- 2.0.0
- 2.0.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ numpy:
openssl:
- '3'
orc:
- 2.0.0
- 2.0.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions recipe/build-pyarrow.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ source:
folder: testing

build:
number: 22
number: 23
# 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)]
Expand Down Expand Up @@ -697,6 +697,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 }}

Expand All @@ -709,7 +711,7 @@ outputs:
- pyarrow.compute
- pyarrow.flight
- pyarrow.gandiva
- pyarrow.orc # [unix]
- pyarrow.orc
- pyarrow.parquet
- pyarrow.fs
- pyarrow._s3fs
Expand Down