Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ VCPKG="9b965a116838c6cdcd36bca60d1b81b030c8ab8d" # 2026.05.27 (not release, u
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
# This is a workaround for our CI problem that "archery docker build" doesn't
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-09-09
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-10-01
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-09-14

350 changes: 350 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 @@ -32,7 +32,7 @@ project(
# * 22.04: 0.61.2
# * 24.04: 1.3.2
meson_version: '>=0.61.2',
version: '26.0.0-SNAPSHOT',
version: '26.0.0',
)

version = meson.project_version()
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": "26.0.0-SNAPSHOT",
"version-string": "26.0.0",
"$comment:dependencies": "We can enable gobject-introspection again once it's updated",
"dependencies": [
"glib",
Expand Down
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=25.0.1.9000
pkgver=26.0.0
pkgrel=8000
pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
arch=("any")
Expand Down
34 changes: 34 additions & 0 deletions ci/vcpkg/ports.patch
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,37 @@ index 278bc17a1c..d47d859360 100644
)
file(GLOB modules "${SOURCE_PATH}/cmake_modules/Find*.cmake")
file(REMOVE ${modules} "${SOURCE_PATH}/c++/libs/libhdfspp/libhdfspp.tar.gz")
diff --git a/ports/uriparser/fix-glibc-2.28-reallocarray.diff b/ports/uriparser/fix-glibc-2.28-reallocarray.diff
new file mode 100644
index 0000000..57adef4
--- /dev/null
+++ b/ports/uriparser/fix-glibc-2.28-reallocarray.diff
@@ -0,0 +1,15 @@
+diff --git a/src/UriMemory.c b/src/UriMemory.c
+--- a/src/UriMemory.c
++++ b/src/UriMemory.c
+@@ -50,6 +50,11 @@
+ # define _DEFAULT_SOURCE 1
+ # endif
+
++// For glibc <2.29
++# if !defined(_GNU_SOURCE)
++# define _GNU_SOURCE 1
++# endif
++
+ // For NetBSD (stdlib.h revision 1.122 of 2020-05-26)
+ # if defined(__NetBSD__) && !defined(_OPENBSD_SOURCE)
+ # define _OPENBSD_SOURCE 1
diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake
index 5df5e94..225e5fb 100644
--- a/ports/uriparser/portfile.cmake
+++ b/ports/uriparser/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
REF "uriparser-${VERSION}"
SHA512 1e4c397418e71e705b5712de2dc3ea6e95163c9d95bfbaa5f7d2fd2344d34eaf167d7d9389ab9671cfb314af026621b56e632ea34b681c2f4d7951a1b32a98b4
HEAD_REF master
+ PATCHES
+ fix-glibc-2.28-reallocarray.diff
)

if("tool" IN_LIST FEATURES)
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ if(POLICY CMP0170)
cmake_policy(SET CMP0170 NEW)
endif()

set(ARROW_VERSION "26.0.0-SNAPSHOT")
set(ARROW_VERSION "26.0.0")

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

Expand Down
1 change: 1 addition & 0 deletions cpp/examples/minimal_build/system_dependency.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ RUN apt-get update -y -q && \
libre2-dev \
libsnappy-dev \
libthrift-dev \
liburiparser-dev \
libutf8proc-dev \
libzstd-dev \
pkg-config \
Expand Down
2 changes: 1 addition & 1 deletion cpp/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ project(
'arrow',
'cpp',
'c',
version: '26.0.0-SNAPSHOT',
version: '26.0.0',
license: 'Apache-2.0',
meson_version: '>=1.3.0',
default_options: ['c_std=c11', 'warning_level=2', 'cpp_std=c++20'],
Expand Down
9 changes: 9 additions & 0 deletions cpp/src/arrow/util/async_generator_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,9 @@ TEST_F(MergedGeneratorErrorHookTest, OuterErrorToWaiterNotOvertakenByLaterPull)
// receives the error has completed, even when it is requested while the generator is
// already completing.
TEST_F(MergedGeneratorErrorHookTest, InnerErrorToWaiterNotOvertakenDuringCompletion) {
#ifndef ARROW_ENABLE_THREADING
GTEST_SKIP() << "Test requires threading support";
#endif
auto failing = Future<TestInt>::Make();
AsyncGenerator<TestInt> failing_sub = [failing]() { return failing; };
std::vector<AsyncGenerator<TestInt>> subs = {failing_sub};
Expand All @@ -994,6 +997,9 @@ TEST_F(MergedGeneratorErrorHookTest, InnerErrorToWaiterNotOvertakenDuringComplet
}

TEST_F(MergedGeneratorErrorHookTest, OuterErrorToWaiterNotOvertakenDuringCompletion) {
#ifndef ARROW_ENABLE_THREADING
GTEST_SKIP() << "Test requires threading support";
#endif
auto failing = Future<AsyncGenerator<TestInt>>::Make();
AsyncGenerator<AsyncGenerator<TestInt>> source = [failing]() { return failing; };
MergedGenerator<TestInt> gen(std::move(source), 1);
Expand All @@ -1011,6 +1017,9 @@ TEST_F(MergedGeneratorErrorHookTest, OuterErrorToWaiterNotOvertakenDuringComplet
}

TEST_F(MergedGeneratorErrorHookTest, ClaimedErrorNotOvertakenDuringCompletion) {
#ifndef ARROW_ENABLE_THREADING
GTEST_SKIP() << "Test requires threading support";
#endif
auto failing = Future<TestInt>::Make();
AsyncGenerator<TestInt> failing_sub = [failing]() { return failing; };
std::vector<AsyncGenerator<TestInt>> subs = {MakeVectorGenerator<TestInt>({TestInt(1)}),
Expand Down
Loading
Loading