Skip to content

GH-45295: [Python][CI] Make download_tzdata_on_windows more robust and use tzdata package for tzinfo database on Windows for ORC #45425

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

Merged
amoeba merged 15 commits into from
Feb 11, 2025
Merged

GH-45295: [Python][CI] Make download_tzdata_on_windows more robust and use tzdata package for tzinfo database on Windows for ORC #45425

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
29467e2
Get tzdata from tzdata package
amoeba Feb 5, 2025
355ea68
Remove pip install tzdata
amoeba Feb 5, 2025
1ab9cd0
Rework how TZDIR is set in pyarrow tests
amoeba Feb 5, 2025
6a85c60
Address lints
amoeba Feb 5, 2025
ae75880
Fix typo
amoeba Feb 5, 2025
1d715f9
Use requests instead of urllib
amoeba Feb 6, 2025
6dfbae2
Add noqa to long line
amoeba Feb 6, 2025
84ab16e
Update urllib call too
amoeba Feb 6, 2025
c13eb9f
Refactor download_tzdata_on_windows
amoeba Feb 6, 2025
1c66cc2
Fix typo
amoeba Feb 6, 2025
459376c
lints
amoeba Feb 6, 2025
6863117
Update python/pyarrow/util.py
amoeba Feb 7, 2025
a53e25f
Make _download* helpers private
amoeba Feb 7, 2025
5e9e76d
Make it clear this section is for ORC
amoeba Feb 7, 2025
dd39e97
Make distinction even more clear
amoeba Feb 7, 2025
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
13 changes: 8 additions & 5 deletions ci/scripts/python_wheel_windows_test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,14 @@ py -0p
@REM Validate wheel contents
%PYTHON_CMD% C:\arrow\ci\scripts\python_wheel_validate_contents.py --path C:\arrow\python\repaired_wheels || exit /B 1

@rem Download IANA Timezone Database for ORC C++
curl https://cygwin.osuosl.org/noarch/release/tzdata/tzdata-2024a-1.tar.xz --output tzdata.tar.xz || exit /B
mkdir %USERPROFILE%\Downloads\test\tzdata
arc unarchive tzdata.tar.xz %USERPROFILE%\Downloads\test\tzdata || exit /B
set TZDIR=%USERPROFILE%\Downloads\test\tzdata\usr\share\zoneinfo
@rem Install tzdata python package and set TZDIR to tzdata database defined inside
%PYTHON_CMD% -m pip install tzdata || exit /B 1
@echo off
setlocal EnableDelayedExpansion
set PYTHON_PROGRAM=!PYTHON_CMD! -c "import os; from importlib import resources; print(os.path.join(resources.files('tzdata'), 'zoneinfo'));"
for /f "delims=" %%i in ('!PYTHON_PROGRAM!') do set "TZDIR=%%i"
setlocal DisabledDelayedExpansion
@echo on
dir %TZDIR%

@REM Execute unittest
Expand Down
Loading