Skip to content

Commit 3b17812

Browse files
author
Rafał Hibner
committed
Merge branch 'tdigest_scaler' into combined3
2 parents 5358d77 + 1c2cd43 commit 3b17812

File tree

215 files changed

+5239
-2823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+5239
-2823
lines changed

‎.env‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ NUMBA=latest
7070
NUMBA_CUDA=latest
7171
NUMPY=latest
7272
PANDAS=latest
73-
PYTHON=3.9
74-
PYTHON_IMAGE_TAG=3.9
75-
PYTHON_ABI_TAG=cp39
73+
PYTHON=3.10
74+
PYTHON_IMAGE_TAG=3.10
75+
PYTHON_ABI_TAG=cp310
7676
R=4.5
7777
SPARK=master
7878
TURBODBC=latest
@@ -83,6 +83,7 @@ R_ORG=rhub
8383
R_TAG=latest
8484

8585
# Env vars for R builds
86+
R_UPDATE_CLANG=false
8687
R_CUSTOM_CCACHE=false
8788
ARROW_R_DEV=TRUE
8889
R_PRUNE_DEPS=FALSE
@@ -97,8 +98,8 @@ VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
9798
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
9899
# This is a workaround for our CI problem that "archery docker build" doesn't
99100
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
100-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-02-25
101-
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-02-25
101+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-09-04
102+
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-09-04
102103

103104
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
104105
# See https://github.com/conan-io/conan-docker-tools#readme and

‎.github/workflows/archery.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ jobs:
6565
shell: bash
6666
run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
6767
- name: Setup Python
68-
uses: actions/setup-python@v5.6.0
68+
uses: actions/setup-python@v6.0.0
6969
with:
70-
python-version: '3.9'
70+
python-version: '3.12'
7171
- name: Install pygit2 binary wheel
7272
run: pip install pygit2 --only-binary pygit2
7373
- name: Install Archery, Crossbow- and Test Dependencies

‎.github/workflows/comment_bot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# fetch the tags for version number generation
4343
fetch-depth: 0
4444
- name: Set up Python
45-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
45+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
4646
with:
4747
python-version: 3.12
4848
- name: Install Archery and Crossbow dependencies
@@ -63,7 +63,7 @@ jobs:
6363
if: github.event.comment.body == 'take'
6464
runs-on: ubuntu-latest
6565
steps:
66-
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
66+
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
6767
with:
6868
github-token: ${{ secrets.GITHUB_TOKEN }}
6969
script: |

‎.github/workflows/cpp.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
- name: Setup Python on hosted runner
124124
if: |
125125
matrix.runs-on == 'ubuntu-latest'
126-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
126+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
127127
with:
128128
python-version: 3
129129
- name: Setup Python on self-hosted runner
@@ -235,7 +235,7 @@ jobs:
235235
$(brew --prefix bash)/bin/bash \
236236
ci/scripts/install_minio.sh latest ${ARROW_HOME}
237237
- name: Set up Python
238-
uses: actions/setup-python@v5.6.0
238+
uses: actions/setup-python@v6.0.0
239239
with:
240240
python-version: 3.12
241241
- name: Install Google Cloud Storage Testbench
@@ -465,10 +465,10 @@ jobs:
465465
https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2024-09-13T20-26-02Z
466466
chmod +x /usr/local/bin/minio.exe
467467
- name: Set up Python
468-
uses: actions/setup-python@v5.6.0
468+
uses: actions/setup-python@v6.0.0
469469
id: python-install
470470
with:
471-
python-version: 3.9
471+
python-version: '3.12'
472472
- name: Install Google Cloud Storage Testbench
473473
shell: msys2 {0}
474474
env:

‎.github/workflows/cpp_extra.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
key: extra-${{ matrix.image }}-${{ hashFiles('cpp/**') }}
162162
restore-keys: extra-${{ matrix.image }}-
163163
- name: Setup Python
164-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
164+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
165165
with:
166166
python-version: 3
167167
- name: Setup Archery

‎.github/workflows/csharp.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
dotnet-version: ${{ matrix.dotnet }}
6060
- name: Setup Python
61-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
61+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
6262
with:
6363
python-version: 3
6464
- name: Checkout Arrow
@@ -112,7 +112,7 @@ jobs:
112112
with:
113113
dotnet-version: ${{ matrix.dotnet }}
114114
- name: Setup Python
115-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
115+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
116116
with:
117117
python-version: 3.12
118118
- name: Checkout Arrow
@@ -174,7 +174,7 @@ jobs:
174174
"s/^ <Version>.+<\/Version>/ <Version>${semver}<\/Version>/" \
175175
csharp/Directory.Build.props
176176
- name: Setup Python
177-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
177+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
178178
with:
179179
python-version: 3
180180
- name: Setup Archery

‎.github/workflows/dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
fetch-depth: 0
9292
- name: Install Python
93-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
93+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
9494
with:
9595
python-version: '3.12'
9696
- name: Install Ruby
@@ -105,7 +105,7 @@ jobs:
105105
shell: bash
106106
run: |
107107
gem install test-unit
108-
pip install "cython>=3" setuptools pytest requests setuptools-scm
108+
pip install "cython>=3.1" setuptools pytest requests setuptools-scm
109109
- name: Run Release Test
110110
shell: bash
111111
run: |

‎.github/workflows/dev_pr.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
if: |
5454
(github.event.action == 'opened' ||
5555
github.event.action == 'edited')
56-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
56+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
5757
with:
5858
github-token: ${{ secrets.GITHUB_TOKEN }}
5959
script: |
@@ -64,7 +64,7 @@ jobs:
6464
if: |
6565
(github.event.action == 'opened' ||
6666
github.event.action == 'edited')
67-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
67+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
6868
with:
6969
github-token: ${{ secrets.GITHUB_TOKEN }}
7070
script: |
@@ -75,7 +75,7 @@ jobs:
7575
if: |
7676
(github.event.action == 'opened' ||
7777
github.event.action == 'edited')
78-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
78+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
7979
with:
8080
debug: true
8181
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -87,7 +87,7 @@ jobs:
8787
if: |
8888
(github.event.action == 'opened' ||
8989
github.event.action == 'synchronize')
90-
uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
90+
uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
9191
with:
9292
repo-token: ${{ secrets.GITHUB_TOKEN }}
9393
configuration-path: .github/workflows/dev_pr/labeler.yml

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
key: debian-docs-${{ hashFiles('cpp/**') }}
5353
restore-keys: debian-docs-
5454
- name: Setup Python
55-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
55+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
5656
with:
5757
python-version: 3.12
5858
- name: Setup Archery

‎.github/workflows/docs_light.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ env:
4141
jobs:
4242

4343
light:
44-
name: AMD64 Conda Python 3.9 Sphinx Documentation
44+
name: AMD64 Conda Python 3.12 Sphinx Documentation
4545
runs-on: ubuntu-latest
4646
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
4747
timeout-minutes: 60
4848
env:
49-
PYTHON: "3.9"
49+
PYTHON: "3.12"
5050
steps:
5151
- name: Checkout Arrow
5252
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -59,7 +59,7 @@ jobs:
5959
key: conda-docs-${{ hashFiles('cpp/**') }}
6060
restore-keys: conda-docs-
6161
- name: Setup Python
62-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
62+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
6363
with:
6464
python-version: 3.12
6565
- name: Setup Archery

0 commit comments

Comments
 (0)