Skip to content

Commit 179e8e3

Browse files
fix: arrow-24
1 parent d64d6d2 commit 179e8e3

4 files changed

Lines changed: 75 additions & 74 deletions

File tree

.github/workflows/python-wheel-workflow.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,19 @@ jobs:
136136
dnf config-manager --set-enabled ol$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)_codeready_builder || :
137137
dnf config-manager --set-enabled codeready-builder-for-rhel-$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)-rhui-rpms || :
138138
subscription-manager repos --enable codeready-builder-for-rhel-$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)-$(arch)-rpms || :
139-
dnf install -y arrow-devel-23* # For C++
140-
dnf install -y arrow-glib-devel # For GLib (C)
141-
dnf install -y arrow-dataset-devel # For Apache Arrow Dataset C++
142-
dnf install -y arrow-dataset-glib-devel # For Apache Arrow Dataset GLib (C)
143-
dnf install -y arrow-acero-devel # For Apache Arrow Acero C++
144-
dnf install -y arrow-flight-devel # For Apache Arrow Flight C++
145-
dnf install -y arrow-flight-glib-devel # For Apache Arrow Flight GLib (C)
146-
dnf install -y arrow-flight-sql-devel # For Apache Arrow Flight SQL C++
147-
dnf install -y arrow-flight-sql-glib-devel # For Apache Arrow Flight SQL GLib (C)
148-
dnf install -y gandiva-devel # For Apache Gandiva C++
149-
dnf install -y gandiva-glib-devel # For Apache Gandiva GLib (C)
150-
dnf install -y parquet-devel # For Apache Parquet C++
151-
dnf install -y parquet-glib-devel # For Apache Parquet GLib (C)
139+
dnf install -y arrow-devel-24* # For C++
140+
dnf install -y arrow-glib-devel-24* # For GLib (C)
141+
dnf install -y arrow-dataset-devel-24* # For Apache Arrow Dataset C++
142+
dnf install -y arrow-dataset-glib-devel-24* # For Apache Arrow Dataset GLib (C)
143+
dnf install -y arrow-acero-devel-24* # For Apache Arrow Acero C++
144+
dnf install -y arrow-flight-devel-24* # For Apache Arrow Flight C++
145+
dnf install -y arrow-flight-glib-devel-24* # For Apache Arrow Flight GLib (C)
146+
dnf install -y arrow-flight-sql-devel-24* # For Apache Arrow Flight SQL C++
147+
dnf install -y arrow-flight-sql-glib-devel-24* # For Apache Arrow Flight SQL GLib (C)
148+
dnf install -y gandiva-devel-24* # For Apache Gandiva C++
149+
dnf install -y gandiva-glib-devel-24* # For Apache Gandiva GLib (C)
150+
dnf install -y parquet-devel-24* # For Apache Parquet C++
151+
dnf install -y parquet-glib-devel-24* # For Apache Parquet GLib (C)
152152
CIBW_REPAIR_WHEEL_COMMAND_LINUX: |
153153
auditwheel repair --exclude libarrow.so.* --exclude libparquet.so.* --exclude libarrow_dataset.so.* --exclude libarrow_acero.so.* -w {dest_dir} {wheel}
154154
CIBW_REPAIR_WHEEL_COMMAND_MACOS: |
@@ -203,6 +203,7 @@ jobs:
203203
mamba install -y -c conda-forge arrow-cpp
204204
Add-Content $env:GITHUB_ENV "CMAKE_PREFIX_PATH=$env:CONDA_PREFIX\\Library"
205205
Add-Content $env:GITHUB_ENV "PATH=$env:CONDA_PREFIX\\Library\\bin;$env:PATH"
206+
206207
- name: Download sdist artifact
207208
uses: actions/download-artifact@v8
208209
with:

.github/workflows/python.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ jobs:
6565
-P /tmp/
6666
sudo apt-get install -y /tmp/apache-arrow-apt-source-latest-"$(lsb_release --codename --short)".deb
6767
sudo apt-get update -y
68-
sudo apt install -y libarrow-dev=23.0.1-1 \
69-
libarrow-dataset-dev=23.0.1-1 \
70-
libarrow-acero-dev=23.0.1-1 \
71-
libparquet-dev=23.0.1-1 \
72-
libarrow-compute-dev=23.0.1-1
68+
sudo apt install -y libarrow-dev=24.0.1-1 \
69+
libarrow-dataset-dev=24.0.1-1 \
70+
libarrow-acero-dev=24.0.1-1 \
71+
libparquet-dev=24.0.1-1 \
72+
libarrow-compute-dev=24.0.1-1
7373
sudo apt-get install -y ccache libcurl4-openssl-dev
7474
git clone https://github.com/apache/incubator-graphar-testing.git $GAR_TEST_DATA --depth 1
7575

python/poetry.lock

Lines changed: 52 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python/pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ readme = "README.md"
2828
authors = [{ name = "GraphAr community", email = "dev@graphar.apache.org" }]
2929
requires-python = ">=3.10"
3030
dependencies = [
31-
"typer ~= 0.1",
32-
"pydantic ~= 2.0, < 2.12",
33-
"pyyaml ~= 6.0",
34-
"pyarrow >= 23, < 24",
31+
"typer < 1.0",
32+
"pydantic >= 2.0, < 3",
33+
"pyyaml >= 6.0, <7.0",
34+
"pyarrow >= 24, < 25",
3535
]
3636
license = {text = "Apache-2.0"}
3737
classifiers = [

0 commit comments

Comments
 (0)