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.

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

WIP: Dummy PR to check maint-18.0.0 status #44367

Closed
wants to merge 17 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c8a0a69
GH-44358: [Packaging][Debian] Add workaround for CUDA include path (#…
kou Oct 9, 2024
774495c
GH-44347: [Packaging][C++] Enable Azure file system for deb/rpm (#44348)
kou Oct 10, 2024
7d5efe5
GH-44355: [Packaging][Python] Disable interactive deb configuration i…
kou Oct 10, 2024
e15bbe6
GH-43846: [Python][Packaging] Remove numpy dependency from pyarrow pa…
raulcd Oct 10, 2024
7d4272e
GH-43519: [Python][CI][Packaging] Use released versions to build and …
jorisvandenbossche Oct 10, 2024
037485f
GH-44369: [CI][Python] Remove ds requirement from test collection on …
raulcd Oct 11, 2024
bc71843
GH-44314: [Packaging][Python] Use macOS 12 as deployment target to ha…
raulcd Oct 11, 2024
a39090d
GH-44373: [Packaging][Java] Fix brew link to Python 3.13 on macOS (#4…
raulcd Oct 11, 2024
71bd117
GH-43519: [Python][CI] Add Python 3.13 conda test build (#44192)
jorisvandenbossche Oct 11, 2024
9812ab7
GH-44381: [Ruby][Release] Pin not only glib but also python on verifi…
raulcd Oct 12, 2024
0e184c3
GH-44386: [Integration][Release] Pin Python 3.12 for Integration veri…
raulcd Oct 12, 2024
155a42e
GH-44342: [C++] Disable jemalloc by default on ARM (#44380)
kou Oct 14, 2024
70a2245
GH-44415: [Release][Ruby] Remove pins from glib section of release ve…
amoeba Oct 15, 2024
5d7987b
GH-44422: [Packaging][Release][Linux] Upload artifacts before test (#…
kou Oct 16, 2024
8567163
MINOR: [Release] Update CHANGELOG.md for 18.0.0
raulcd Oct 16, 2024
e47bf46
MINOR: [Release] Update .deb/.rpm changelogs for 18.0.0
raulcd Oct 16, 2024
9105a41
MINOR: [Release] Update versions for 18.0.0
raulcd Oct 16, 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
346 changes: 346 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion c_glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ project('arrow-glib', 'c', 'cpp',
# * 22.04: 0.61.2
meson_version: '>=0.53.2')

version = '18.0.0-SNAPSHOT'
version = '18.0.0'
if version.endswith('-SNAPSHOT')
version_numbers = version.split('-')[0].split('.')
version_tag = version.split('-')[1]
Expand Down
2 changes: 1 addition & 1 deletion c_glib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arrow-glib",
"version-string": "18.0.0-SNAPSHOT",
"version-string": "18.0.0",
"dependencies": [
"glib",
"gobject-introspection",
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/conda-python.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY ci/conda_env_python.txt \
RUN mamba install -q -y \
--file arrow/ci/conda_env_python.txt \
$([ "$python" == $(gdb --batch --eval-command 'python import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")') ] && echo "gdb") \
"python=${python}.*=*_cpython" \
"python=${python}.*=*_cp*" \
nomkl && \
mamba clean --all

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
ARG base
FROM ${base}

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update -y -q && \
apt install -y -q --no-install-recommends software-properties-common gpg-agent && \
add-apt-repository -y ppa:deadsnakes/ppa && \
Expand Down
5 changes: 5 additions & 0 deletions ci/docker/python-wheel-manylinux.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,10 @@ RUN PYTHON_ROOT=$(find /opt/python -name cp${PYTHON_VERSION/./}-${PYTHON_ABI_TAG
SHELL ["/bin/bash", "-i", "-c"]
ENTRYPOINT ["/bin/bash", "-i", "-c"]

# Remove once there are released Cython wheels for 3.13 free-threaded available
RUN if [ "${python_abi_tag}" = "cp313t" ]; then \
pip install cython --pre --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" --prefer-binary ; \
fi

COPY python/requirements-wheel-build.txt /arrow/python/
RUN pip install -r /arrow/python/requirements-wheel-build.txt
2 changes: 1 addition & 1 deletion ci/scripts/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
_realname=arrow
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=17.0.0.9000
pkgver=18.0.0
pkgrel=8000
pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
arch=("any")
Expand Down
9 changes: 8 additions & 1 deletion ci/scripts/python_wheel_macos_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,15 @@ fi
echo "=== (${PYTHON_VERSION}) Install Python build dependencies ==="
export PIP_SITE_PACKAGES=$(python -c 'import site; print(site.getsitepackages()[0])')

# Remove once there are released Cython wheels for 3.13 free-threaded available
FREE_THREADED_BUILD="$(python -c"import sysconfig; print(bool(sysconfig.get_config_var('Py_GIL_DISABLED')))")"
if [[ $FREE_THREADED_BUILD == "True" ]]; then
pip install cython --pre --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" --prefer-binary
fi
# With Python 3.9, the `--upgrade` flag is required to force full replacement of setuptools' distutils patching
pip install --upgrade --target $PIP_SITE_PACKAGES "setuptools>=58"

pip install \
--upgrade \
--only-binary=:all: \
--target $PIP_SITE_PACKAGES \
-r ${source_dir}/python/requirements-wheel-build.txt
Expand Down
4 changes: 3 additions & 1 deletion ci/scripts/python_wheel_manylinux_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ echo "=== (${PYTHON_VERSION}) Building Arrow C++ libraries ==="
: ${ARROW_GANDIVA:=OFF}
: ${ARROW_GCS:=ON}
: ${ARROW_HDFS:=ON}
: ${ARROW_JEMALLOC:=ON}
: ${ARROW_MIMALLOC:=ON}
: ${ARROW_ORC:=ON}
: ${ARROW_PARQUET:=ON}
Expand All @@ -81,6 +80,9 @@ if [[ "$(uname -m)" == arm* ]] || [[ "$(uname -m)" == aarch* ]]; then
# 4k and 64k page arm64 systems. For more context see
# https://github.com/apache/arrow/issues/10929
export ARROW_EXTRA_CMAKE_FLAGS="-DARROW_JEMALLOC_LG_PAGE=16"
: ${ARROW_JEMALLOC:=OFF}
else
: ${ARROW_JEMALLOC:=ON}
fi

mkdir /tmp/arrow-build
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if(POLICY CMP0170)
cmake_policy(SET CMP0170 NEW)
endif()

set(ARROW_VERSION "18.0.0-SNAPSHOT")
set(ARROW_VERSION "18.0.0")

string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" ARROW_BASE_VERSION "${ARROW_VERSION}")

Expand Down
6 changes: 5 additions & 1 deletion cpp/cmake_modules/DefineOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -364,14 +364,18 @@ takes precedence over ccache if a storage backend is configured" ON)

set(ARROW_JEMALLOC_DESCRIPTION "Build the Arrow jemalloc-based allocator")
if(WIN32
OR "${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD"
OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch|ARM|arm"
OR NOT ARROW_ENABLE_THREADING)
# jemalloc is not supported on Windows.
#
# jemalloc is the default malloc implementation on FreeBSD and can't
# be built with --disable-libdl on FreeBSD. Because lazy-lock feature
# is required on FreeBSD. Lazy-lock feature requires libdl.
#
# jemalloc may have a problem on ARM.
# See also: https://github.com/apache/arrow/issues/44342
#
# jemalloc requires thread.
define_option(ARROW_JEMALLOC ${ARROW_JEMALLOC_DESCRIPTION} OFF)
else()
Expand Down
2 changes: 1 addition & 1 deletion cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arrow",
"version-string": "18.0.0-SNAPSHOT",
"version-string": "18.0.0",
"dependencies": [
"abseil",
{
Expand Down
2 changes: 1 addition & 1 deletion csharp/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<Product>Apache Arrow library</Product>
<Copyright>Copyright 2016-2024 The Apache Software Foundation</Copyright>
<Company>The Apache Software Foundation</Company>
<Version>18.0.0-SNAPSHOT</Version>
<Version>18.0.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 1 addition & 3 deletions dev/release/verify-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -775,9 +775,7 @@ test_glib() {
show_header "Build and test C GLib libraries"

# Build and test C GLib
# We can remove '==2.80.5' once https://github.com/conda-forge/glib-feedstock/issues/191
# is fixed.
maybe_setup_conda glib==2.80.5 gobject-introspection meson ninja ruby
maybe_setup_conda glib gobject-introspection meson ninja ruby
maybe_setup_virtualenv meson

# Install bundler if doesn't exist
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/homebrew-formulae/apache-arrow-glib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class ApacheArrowGlib < Formula
desc "GLib bindings for Apache Arrow"
homepage "https://arrow.apache.org/"
url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-18.0.0-SNAPSHOT/apache-arrow-18.0.0-SNAPSHOT.tar.gz"
url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-18.0.0/apache-arrow-18.0.0.tar.gz"
sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28"
license "Apache-2.0"
head "https://github.com/apache/arrow.git", branch: "main"
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/homebrew-formulae/apache-arrow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class ApacheArrow < Formula
desc "Columnar in-memory analytics layer designed to accelerate big data"
homepage "https://arrow.apache.org/"
url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-18.0.0-SNAPSHOT/apache-arrow-18.0.0-SNAPSHOT.tar.gz"
url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-18.0.0/apache-arrow-18.0.0.tar.gz"
sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28"
license "Apache-2.0"
head "https://github.com/apache/arrow.git", branch: "main"
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/java-jars/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ jobs:
for python_package in $(brew list | grep python@); do
brew install --overwrite ${python_package}
done
brew install --overwrite python

brew bundle --file=arrow/cpp/Brewfile
# We want to link aws-sdk-cpp statically but Homebrew's
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
apache-arrow-apt-source (18.0.0-1) unstable; urgency=low

* New upstream release.

-- Raúl Cumplido <[email protected]> Wed, 16 Oct 2024 09:19:50 -0000

apache-arrow-apt-source (17.0.0-1) unstable; urgency=low

* New upstream release.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ else
fi

%changelog
* Wed Oct 16 2024 Raúl Cumplido <[email protected]> - 18.0.0-1
- New upstream release.

* Thu Jul 11 2024 Raúl Cumplido <[email protected]> - 17.0.0-1
- New upstream release.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ RUN \
valac \
zlib1g-dev && \
if apt list | grep '^nvidia-cuda-toolkit/'; then \
apt install -y -V ${quiet} nvidia-cuda-toolkit; \
apt install -y -V ${quiet} nvidia-cuda-toolkit && \
# GH-44358: Workaround for non-existent path error
mkdir -p \
/usr/lib/nvidia-cuda-toolkit/include/$(dpkg-architecture -qDEB_HOST_MULTIARCH); \
fi && \
apt clean
6 changes: 6 additions & 0 deletions dev/tasks/linux-packages/apache-arrow/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
apache-arrow (18.0.0-1) unstable; urgency=low

* New upstream release.

-- Raúl Cumplido <[email protected]> Wed, 16 Oct 2024 09:19:50 -0000

apache-arrow (17.0.0-1) unstable; urgency=low

* New upstream release.
Expand Down
8 changes: 8 additions & 0 deletions dev/tasks/linux-packages/apache-arrow/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ BUILD_TYPE=release
dh $@ --with gir

override_dh_auto_configure:
code_name="$$(. /etc/os-release && \
echo $${VERSION_CODENAME})"; \
if [ "$${code_name}" = "focal" ]; then \
ARROW_AZURE=OFF; \
else \
ARROW_AZURE=ON; \
fi; \
if dpkg -l nvidia-cuda-toolkit > /dev/null 2>&1; then \
ARROW_CUDA=ON; \
else \
Expand All @@ -24,6 +31,7 @@ override_dh_auto_configure:
--builddirectory=cpp_build \
--buildsystem=cmake+ninja \
-- \
-DARROW_AZURE=$${ARROW_AZURE} \
-DARROW_BUILD_UTILITIES=ON \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ RUN \
gobject-introspection-devel \
json-devel \
libarchive \
libxml2-devel \
libzstd-devel \
llvm-devel \
llvm-static \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ RUN \
gobject-introspection-devel \
json-devel \
libarchive \
libxml2-devel \
libzstd-devel \
llvm-devel \
llvm-static \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN \
gobject-introspection-devel \
grpc-devel \
grpc-plugins \
libxml2-devel \
libzstd-devel \
llvm-devel \
lz4-devel \
Expand Down
10 changes: 10 additions & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
%define gcc_package gcc
%endif

%define use_azure (%{_rhel} >= 8 || %{_amzn} >= 2023)
%define use_bundled_nlohmann_json (%{_rhel} == 8)
%define use_flight (%{_rhel} >= 8 || %{_amzn} >= 2023)
%define use_gandiva (%{_rhel} >= 8 || %{_amzn} >= 2023)
Expand Down Expand Up @@ -121,6 +122,9 @@ BuildRequires: grpc-plugins
%if %{use_gcs} && !%{use_bundled_nlohmann_json}
BuildRequires: json-devel
%endif
%if %{use_azure}
BuildRequires: libxml2-devel
%endif
BuildRequires: libzstd-devel
BuildRequires: lz4-devel %{lz4_requirement}
BuildRequires: ninja-build
Expand Down Expand Up @@ -161,6 +165,9 @@ Apache Arrow is a data processing library for analysis.
cpp_build_type=release
cd cpp
%arrow_cmake \
%if %{use_azure}
-DARROW_AZURE=ON \
%endif
-DARROW_BUILD_UTILITIES=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=ON \
Expand Down Expand Up @@ -887,6 +894,9 @@ Documentation for Apache Parquet GLib.
%endif

%changelog
* Wed Oct 16 2024 Raúl Cumplido <[email protected]> - 18.0.0-1
- New upstream release.

* Thu Jul 11 2024 Raúl Cumplido <[email protected]> - 17.0.0-1
- New upstream release.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ RUN \
glog-devel \
gobject-introspection-devel \
json-devel \
libxml2-devel \
libzstd-devel \
lz4-devel \
ninja-build \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ RUN \
gobject-introspection-devel \
json-devel \
libarchive \
libxml2-devel \
libzstd-devel \
llvm-devel \
llvm-static \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ RUN \
gobject-introspection-devel \
json-devel \
libarchive \
libxml2-devel \
libzstd-devel \
llvm-devel \
lz4-devel \
Expand Down
7 changes: 4 additions & 3 deletions dev/tasks/linux-packages/github.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ jobs:
APT_TARGETS: {{ target }}
REPO: {{ '${{ secrets.REPO }}' }}
YUM_TARGETS: {{ target }}

{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/*/*/repositories/**/*{}") %}
{{ macros.github_upload_releases(patterns)|indent }}

- name: Set up test
run: |
sudo apt install -y \
Expand Down Expand Up @@ -123,6 +127,3 @@ jobs:
APT_TARGETS: {{ target }}
ARROW_VERSION: {{ arrow.version }}
YUM_TARGETS: {{ target }}

{% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/*/*/repositories/**/*{}") %}
{{ macros.github_upload_releases(patterns)|indent }}
13 changes: 4 additions & 9 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -416,24 +416,19 @@ tasks:

{############################## Wheel macOS ####################################}

{% for macos_version, macos_codename in [("13.0", "ventura")] %}
{% set platform_tag = "macosx_{}_x86_64".format(macos_version.replace('.', '_')) %}

wheel-macos-{{ macos_codename }}-{{ python_tag }}-{{ abi_tag }}-amd64:
wheel-macos-monterey-{{ python_tag }}-{{ abi_tag }}-amd64:
ci: github
template: python-wheels/github.osx.yml
params:
arch: "x86_64"
arrow_jemalloc: "ON"
python_version: "{{ python_version }}"
python_abi_tag: "{{ abi_tag }}"
macos_deployment_target: "{{ macos_version }}"
macos_deployment_target: "12.0"
runs_on: "macos-13"
vcpkg_arch: "amd64"
artifacts:
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl

{% endfor %}
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-macosx_12_0_x86_64.whl

wheel-macos-monterey-{{ python_tag }}-{{ abi_tag }}-arm64:
ci: github
Expand Down Expand Up @@ -1213,7 +1208,7 @@ tasks:
UBUNTU: 22.04
image: ubuntu-cpp-emscripten

{% for python_version in ["3.9", "3.10", "3.11", "3.12"] %}
{% for python_version in ["3.9", "3.10", "3.11", "3.12", "3.13"] %}
test-conda-python-{{ python_version }}:
ci: github
template: docker-tests/github.linux.yml
Expand Down
8 changes: 8 additions & 0 deletions dev/tasks/verify-rc/github.macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ jobs:
TEST_{{ target|upper }}: 1
{% if use_conda %}
USE_CONDA: 1
{% if target == "integration" %}
# JPype doesn't work with Python 3.13.
# See also:
# * https://discuss.python.org/t/api-for-python-3-13-prevents-use-of-3rd-party-gc-allocators/62709/5
# * GH-44386
# * GH-44389
PYTHON_VERSION: "3.12"
{% endif %}
{% endif %}
run: |
arrow/dev/release/verify-release-candidate.sh {{ release|default("") }} {{ rc|default("") }}
Loading
Loading