Skip to content

Commit 9c03473

Browse files
authored
Merge pull request #167 from h-vetinari/tzdir
do not set TZDIR for orc on windows
2 parents 54bc3a1 + d5a9422 commit 9c03473

File tree

4 files changed

+469
-1
lines changed

4 files changed

+469
-1
lines changed

.scripts/run_osx_build.sh

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recipe/meta.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ source:
1111
- url: https://www.apache.org/dyn/closer.lua/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz?action=download
1212
fn: apache-arrow-{{ version }}.tar.gz
1313
sha256: 131250cd24dec0cddde04e2ad8c9e2bc43edc5e84203a81cf71cf1a33a6e7e0f
14+
patches:
15+
# backport https://github.com/apache/arrow/pull/48261
16+
- patches/0001-GH-48260-C-Python-R-Move-S3-bucket-references-to-new.patch
17+
# avoid setting TZDIR (incorrectly) for orc, which already handles cf's tzdata natively
18+
- patches/0002-don-t-set-TZDIR-for-tests-orc-finds-tzdata-in-conda-.patch
1419

1520
# testing-submodules not part of release tarball
1621
- git_url: https://github.com/apache/arrow-testing.git
@@ -21,7 +26,7 @@ source:
2126
folder: cpp/submodules/parquet-testing
2227

2328
build:
24-
number: 0
29+
number: 1
2530
# for cuda support, building with one version is enough to be compatible with
2631
# all later versions, since arrow is only using libcuda, and not libcudart.
2732
skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]

0 commit comments

Comments
 (0)