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

GH-37880: [CI][Python][Packaging] Add support for Python 3.12 #37977

Closed
wants to merge 14 commits into from
Closed

GH-37880: [CI][Python][Packaging] Add support for Python 3.12 #37977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
907f66d
GH-37880: [CI][Python][Packaging] Add support for Python 3.12
raulcd Sep 27, 2023
5cee4a8
Fix elif on bash for installing Python on macOS
raulcd Sep 27, 2023
7b4f267
Test wheels with 3.12.0rc3
raulcd Sep 27, 2023
54d5d34
Update Pypa image for manylinux 2_28
raulcd Sep 27, 2023
349f362
pip install upgrade setuptools too
raulcd Sep 27, 2023
3e3046c
Try with numpy 1.26 for Python 3.12
raulcd Sep 27, 2023
125ac34
Require latest numpy for Python 3.12
raulcd Sep 27, 2023
dbd90cc
Use latest GCS to see if it fixes CI
raulcd Sep 27, 2023
e92c96b
Temporarily disable install_gcs_testbench
raulcd Sep 27, 2023
1702ee2
Merge branch 'main' into GH-37880
terencehonles Oct 2, 2023
53ea492
update for release version
terencehonles Oct 2, 2023
d61ef48
remove --pre flag to choco
terencehonles Oct 2, 2023
58a41e0
use same 3.10 version
terencehonles Oct 2, 2023
7f66da9
Merge branch 'main' into GH-37880
terencehonles Oct 3, 2023
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
3 changes: 2 additions & 1 deletion ci/docker/python-wheel-manylinux-test.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ COPY python/requirements-wheel-test.txt /arrow/python/
RUN pip install -r /arrow/python/requirements-wheel-test.txt

COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN PYTHON=python /arrow/ci/scripts/install_gcs_testbench.sh default
# TODO: Temporarily disable installing GCS testbench
# RUN PYTHON=python /arrow/ci/scripts/install_gcs_testbench.sh default
5 changes: 3 additions & 2 deletions ci/docker/python-wheel-windows-test-vs2017.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ RUN wmic product where "name like 'python%%'" call uninstall /nointeractive && \
ARG python=3.8
RUN (if "%python%"=="3.8" setx PYTHON_VERSION "3.8.10" && setx PATH "%PATH%;C:\Python38;C:\Python38\Scripts") & \
(if "%python%"=="3.9" setx PYTHON_VERSION "3.9.13" && setx PATH "%PATH%;C:\Python39;C:\Python39\Scripts") & \
(if "%python%"=="3.10" setx PYTHON_VERSION "3.10.8" && setx PATH "%PATH%;C:\Python310;C:\Python310\Scripts") & \
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.0" && setx PATH "%PATH%;C:\Python311;C:\Python311\Scripts")
(if "%python%"=="3.10" setx PYTHON_VERSION "3.10.13" && setx PATH "%PATH%;C:\Python310;C:\Python310\Scripts") & \
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.5" && setx PATH "%PATH%;C:\Python311;C:\Python311\Scripts") & \
(if "%python%"=="3.12" setx PYTHON_VERSION "3.12.0" && setx PATH "%PATH%;C:\Python312;C:\Python312\Scripts")
RUN choco install -r -y --no-progress python --version=%PYTHON_VERSION%
RUN python -m pip install -U pip setuptools
5 changes: 3 additions & 2 deletions ci/docker/python-wheel-windows-vs2017.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ RUN wmic product where "name like 'python%%'" call uninstall /nointeractive && \
ARG python=3.8
RUN (if "%python%"=="3.8" setx PYTHON_VERSION "3.8.10" && setx PATH "%PATH%;C:\Python38;C:\Python38\Scripts") & \
(if "%python%"=="3.9" setx PYTHON_VERSION "3.9.13" && setx PATH "%PATH%;C:\Python39;C:\Python39\Scripts") & \
(if "%python%"=="3.10" setx PYTHON_VERSION "3.10.8" && setx PATH "%PATH%;C:\Python310;C:\Python310\Scripts") & \
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.0" && setx PATH "%PATH%;C:\Python311;C:\Python311\Scripts")
(if "%python%"=="3.10" setx PYTHON_VERSION "3.10.13" && setx PATH "%PATH%;C:\Python310;C:\Python310\Scripts") & \
(if "%python%"=="3.11" setx PYTHON_VERSION "3.11.5" && setx PATH "%PATH%;C:\Python311;C:\Python311\Scripts") & \
(if "%python%"=="3.12" setx PYTHON_VERSION "3.12.0" && setx PATH "%PATH%;C:\Python312;C:\Python312\Scripts")
RUN choco install -r -y --no-progress python --version=%PYTHON_VERSION%
RUN python -m pip install -U pip setuptools

Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/install_gcs_testbench.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ esac

version=$1
if [[ "${version}" -eq "default" ]]; then
version="v0.36.0"
version="v0.37.0"
fi

${PYTHON:-python3} -m pip install \
Expand Down
7 changes: 4 additions & 3 deletions ci/scripts/install_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ platforms=([windows]=Windows
declare -A versions
versions=([3.8]=3.8.10
[3.9]=3.9.13
[3.10]=3.10.8
[3.11]=3.11.0)
[3.10]=3.10.13
[3.11]=3.11.5
[3.12]=3.12.0)

if [ "$#" -ne 2 ]; then
echo "Usage: $0 <platform> <version>"
Expand All @@ -45,7 +46,7 @@ full_version=${versions[$2]}
if [ $platform = "MacOSX" ]; then
echo "Downloading Python installer..."

if [ "$(uname -m)" = "arm64" ] || [ "$version" = "3.10" ] || [ "$version" = "3.11" ]; then
if [ "$(uname -m)" = "arm64" ] || [ "$version" = "3.10" ] || [ "$version" = "3.11" ] || [ "$version" = "3.12" ]; then
fname="python-${full_version}-macos11.pkg"
else
fname="python-${full_version}-macosx10.9.pkg"
Expand Down
3 changes: 2 additions & 1 deletion ci/scripts/python_wheel_windows_test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ set PARQUET_TEST_DATA=C:\arrow\submodules\parquet-testing\data
pip install -r C:\arrow\python\requirements-wheel-test.txt || exit /B 1

@REM Install GCS testbench
call "C:\arrow\ci\scripts\install_gcs_testbench.bat"
@REM TODO: Temporarily disable installing GCS testbench
@REM call "C:\arrow\ci\scripts\install_gcs_testbench.bat"

@REM Install the built wheels
python -m pip install --no-index --find-links=C:\arrow\python\dist\ pyarrow || exit /B 1
Expand Down
6 changes: 3 additions & 3 deletions dev/release/verify-release-candidate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ test_linux_wheels() {
local arch="x86_64"
fi

local python_versions="${TEST_PYTHON_VERSIONS:-3.8 3.9 3.10 3.11}"
local python_versions="${TEST_PYTHON_VERSIONS:-3.8 3.9 3.10 3.11 3.12}"
local platform_tags="${TEST_WHEEL_PLATFORM_TAGS:-manylinux_2_17_${arch}.manylinux2014_${arch} manylinux_2_28_${arch}}"

for python in ${python_versions}; do
Expand All @@ -1042,11 +1042,11 @@ test_macos_wheels() {

# apple silicon processor
if [ "$(uname -m)" = "arm64" ]; then
local python_versions="3.8 3.9 3.10 3.11"
local python_versions="3.8 3.9 3.10 3.11 3.12"
local platform_tags="macosx_11_0_arm64"
local check_flight=OFF
else
local python_versions="3.8 3.9 3.10 3.11"
local python_versions="3.8 3.9 3.10 3.11 3.12"
local platform_tags="macosx_10_14_x86_64"
fi

Expand Down
5 changes: 3 additions & 2 deletions dev/tasks/python-wheels/github.osx.amd64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,10 @@ jobs:
run: |
$PYTHON -m venv test-amd64-env
source test-amd64-env/bin/activate
pip install --upgrade pip wheel
pip install --upgrade setuptools pip wheel
arch -x86_64 pip install -r arrow/python/requirements-wheel-test.txt
PYTHON=python arch -x86_64 arrow/ci/scripts/install_gcs_testbench.sh default
# TODO: Temporarily disable installing GCS testbench
# PYTHON=python arch -x86_64 arrow/ci/scripts/install_gcs_testbench.sh default
arch -x86_64 arrow/ci/scripts/python_wheel_unix_test.sh $(pwd)/arrow

{{ macros.github_upload_releases("arrow/python/repaired_wheels/*.whl")|indent }}
Expand Down
9 changes: 5 additions & 4 deletions dev/tasks/python-wheels/github.osx.arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,15 @@ jobs:
run: |
$PYTHON -m venv test-arm64-env
source test-arm64-env/bin/activate
pip install --upgrade pip wheel
pip install --upgrade setuptools pip wheel
# libffi has to be installed on the m1 runner which causes issues with
# the cffi wheel. We build cffi with the flags pointing to the correct libffi location.
LDFLAGS=-L$(brew --prefix libffi)/lib CFLAGS=-I$(brew --prefix libffi)/include \
pip install cffi --no-binary :all:
pip install -r arrow/python/requirements-wheel-test.txt
PYTHON=python arrow/ci/scripts/install_gcs_testbench.sh default
arrow/ci/scripts/python_wheel_unix_test.sh $(pwd)/arrow
pip install -r arrow/python/requirements-wheel-test.txt
# TODO: Temporarily disable installing GCS testbench
# PYTHON=python arrow/ci/scripts/install_gcs_testbench.sh default
arrow/ci/scripts/python_wheel_unix_test.sh $(pwd)/arrow

- name: Upload artifacts
shell: bash
Expand Down
7 changes: 4 additions & 3 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,8 @@ tasks:
{% for python_version, python_tag, abi_tag in [("3.8", "cp38", "cp38"),
("3.9", "cp39", "cp39"),
("3.10", "cp310", "cp310"),
("3.11", "cp311", "cp311")] %}
("3.11", "cp311", "cp311"),
("3.12", "cp312", "cp312")] %}

{############################## Wheel Linux ##################################}

Expand Down Expand Up @@ -541,7 +542,7 @@ tasks:
artifacts:
- pyarrow-{no_rc_version}-cp38-cp38-macosx_11_0_arm64.whl

{% for python_version, python_tag in [("3.9", "cp39"), ("3.10", "cp310"), ("3.11", "cp311")] %}
{% for python_version, python_tag in [("3.9", "cp39"), ("3.10", "cp310"), ("3.11", "cp311"), ("3.12", "cp312")] %}
wheel-macos-big-sur-{{ python_tag }}-arm64:
ci: github
template: python-wheels/github.osx.arm64.yml
Expand Down Expand Up @@ -1255,7 +1256,7 @@ tasks:
flags: "-e ARROW_CSV=ON -e ARROW_PARQUET=ON"
image: ubuntu-cpp-minimal

{% for python_version in ["3.8", "3.9", "3.10", "3.11"] %}
{% for python_version in ["3.8", "3.9", "3.10", "3.11", "3.12"] %}
test-conda-python-{{ python_version }}:
ci: github
template: docker-tests/github.linux.yml
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ services:
args:
arch: ${ARCH}
arch_short: ${ARCH_SHORT}
base: quay.io/pypa/manylinux2014_${ARCH_ALIAS}:2022-10-25-fbea779
base: quay.io/pypa/manylinux2014_${ARCH_ALIAS}:2023-09-24-36b93e4
vcpkg: ${VCPKG}
python: ${PYTHON}
manylinux: 2014
Expand All @@ -1056,7 +1056,7 @@ services:
args:
arch: ${ARCH}
arch_short: ${ARCH_SHORT}
base: quay.io/pypa/manylinux_2_28_${ARCH_ALIAS}:2023-01-14-103cb93
base: quay.io/pypa/manylinux_2_28_${ARCH_ALIAS}:2023-09-24-36b93e4
vcpkg: ${VCPKG}
python: ${PYTHON}
manylinux: 2_28
Expand Down
15 changes: 10 additions & 5 deletions python/requirements-wheel-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,23 @@ pytz
tzdata; sys_platform == 'win32'

numpy==1.21.3; platform_system == "Linux" and platform_machine == "aarch64" and python_version < "3.11"
numpy==1.23.4; platform_system == "Linux" and platform_machine == "aarch64" and python_version >= "3.11"
numpy==1.23.4; platform_system == "Linux" and platform_machine == "aarch64" and python_version == "3.11"
numpy==1.26.0; platform_system == "Linux" and platform_machine == "aarch64" and python_version >= "3.12"
numpy==1.19.5; platform_system == "Linux" and platform_machine != "aarch64" and python_version < "3.9"
numpy==1.21.3; platform_system == "Linux" and platform_machine != "aarch64" and python_version >= "3.9" and python_version < "3.11"
numpy==1.23.4; platform_system == "Linux" and platform_machine != "aarch64" and python_version >= "3.11"
numpy==1.23.4; platform_system == "Linux" and platform_machine != "aarch64" and python_version == "3.11"
numpy==1.26.0; platform_system == "Linux" and platform_machine != "aarch64" and python_version >= "3.11"
numpy==1.21.3; platform_system == "Darwin" and platform_machine == "arm64" and python_version < "3.11"
numpy==1.23.4; platform_system == "Darwin" and platform_machine == "arm64" and python_version >= "3.11"
numpy==1.23.4; platform_system == "Darwin" and platform_machine == "arm64" and python_version == "3.11"
numpy==1.26.0; platform_system == "Darwin" and platform_machine == "arm64" and python_version >= "3.12"
numpy==1.19.5; platform_system == "Darwin" and platform_machine != "arm64" and python_version < "3.9"
numpy==1.21.3; platform_system == "Darwin" and platform_machine != "arm64" and python_version >= "3.9" and python_version < "3.11"
numpy==1.23.4; platform_system == "Darwin" and platform_machine != "arm64" and python_version >= "3.11"
numpy==1.23.4; platform_system == "Darwin" and platform_machine != "arm64" and python_version == "3.11"
numpy==1.26.0; platform_system == "Darwin" and platform_machine != "arm64" and python_version >= "3.12"
numpy==1.19.5; platform_system == "Windows" and python_version < "3.9"
numpy==1.21.3; platform_system == "Windows" and python_version >= "3.9" and python_version < "3.11"
numpy==1.23.4; platform_system == "Windows" and python_version >= "3.11"
numpy==1.23.4; platform_system == "Windows" and python_version == "3.11"
numpy==1.26.0; platform_system == "Windows" and python_version >= "3.12"

pandas<1.1.0; platform_system == "Linux" and platform_machine != "aarch64" and python_version < "3.8"
pandas; platform_system == "Linux" and platform_machine != "aarch64" and python_version >= "3.8"
Expand Down
1 change: 1 addition & 0 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@ def has_ext_modules(foo):
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
],
license='Apache License, Version 2.0',
maintainer='Apache Arrow Developers',
Expand Down