Skip to content
Open
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
name: Rust CI
strategy:
matrix:
os: [ubuntu-latest, macos-13, macos-14] # macos-13: x86, macos-14: arm64

Check warning on line 188 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / 🍏 YAML

188:49 [comments] too few spaces before comment
runs-on: ${{ matrix.os }}
timeout-minutes: 45
steps:
Expand All @@ -201,7 +201,7 @@
name: C++ CI
strategy:
matrix:
os: [ubuntu-latest, macos-13, macos-14, windows-2022] # macos-13: x86, macos-14: arm64

Check warning on line 204 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / 🍏 YAML

204:63 [comments] too few spaces before comment
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -219,7 +219,7 @@
strategy:
matrix:
python-version: [3.8, 3.12]
os: [ubuntu-20.04, windows-2022]
os: [ubuntu-20.04, macos-13, macos-14, windows-2022]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
9 changes: 1 addition & 8 deletions ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,7 @@ deploy_python() {
}

install_pyarrow() {
pyversion=$(python -V | cut -d' ' -f2)
if [[ $pyversion == 3.7* ]]; then
pyarrow_version=12.0.0
sed -i -E "s/pyarrow_version = .*/pyarrow_version = \"12.0.0\"/" "$ROOT"/python/setup.py
else
pyarrow_version=14.0.0
fi
pip install pyarrow==$pyarrow_version
pip install pyarrow==14.0.0
}

deploy_scala() {
Expand Down
4 changes: 2 additions & 2 deletions ci/run_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ install_pyfury() {
pip install Cython wheel "numpy<2.0.0" pytest
pushd "$ROOT/python"
pip list
export PATH=~/bin:$PATH
echo "Install pyfury"
# Fix strange installed deps not found
pip install setuptools
pip install setuptools -U
bazel build //:cp_fury_so
pip install -v -e .
popd
}
Expand Down
5 changes: 2 additions & 3 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
from os.path import join as pjoin

import setuptools
from setuptools import find_packages # Must import before Cython
from distutils.core import setup
from setuptools import find_packages, setup # Must import before Cython
import Cython
import numpy as np
import pyarrow as pa
Expand All @@ -38,7 +37,7 @@
except FileExistsError:
pass

pyarrow_version = "12.0.0"
pyarrow_version = "14.0.0"
# Check if we're running 64-bit Python
if not sys.maxsize > 2**32:
raise RuntimeError("Not supported on 32-bit")
Expand Down
Loading