diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bb76ce1dc..a877d862a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: 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 }} diff --git a/ci/deploy.sh b/ci/deploy.sh index 4a8ab181bd..e989d4eee5 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -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() { diff --git a/ci/run_ci.sh b/ci/run_ci.sh index e562044171..df44b4e9a6 100755 --- a/ci/run_ci.sh +++ b/ci/run_ci.sh @@ -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 } diff --git a/python/setup.py b/python/setup.py index 01be89bccf..1fb1e76603 100644 --- a/python/setup.py +++ b/python/setup.py @@ -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 @@ -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")