Skip to content
Merged
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/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
shell: bash
run: |
gem install test-unit
pip install "cython>=0.29.31" setuptools pytest requests setuptools-scm
pip install "cython>=3" setuptools pytest requests setuptools-scm
- name: Run Release Test
env:
ARROW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion ci/conda_env_python.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# don't add pandas here, because it is not a mandatory test dependency
boto3 # not a direct dependency of s3fs, but needed for our s3fs fixture
cffi
cython>=0.29.31
cython>=3
cloudpickle
fsspec
hypothesis
Expand Down
24 changes: 0 additions & 24 deletions ci/docker/conda-python-cython2.dockerfile

This file was deleted.

8 changes: 0 additions & 8 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1116,14 +1116,6 @@ tasks:
PYTHON: "3.10"
image: conda-python-substrait

test-conda-python-3.10-cython2:
ci: github
template: docker-tests/github.linux.yml
params:
env:
PYTHON: "3.10"
image: conda-python-cython2

test-ubuntu-22.04-python-313-freethreading:
ci: github
template: docker-tests/github.linux.yml
Expand Down
25 changes: 0 additions & 25 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ x-hierarchy:
- conda-python-pandas:
- conda-python-docs
- conda-python-cpython-debug
- conda-python-cython2
- conda-python-dask
- conda-python-emscripten
- conda-python-hdfs
Expand Down Expand Up @@ -1499,30 +1498,6 @@ services:
/arrow/ci/scripts/python_build.sh /arrow /build &&
/arrow/ci/scripts/integration_substrait.sh"]

conda-python-cython2:
# Usage:
# docker compose build conda
# docker compose build conda-cpp
# docker compose build conda-python
# docker compose build conda-python-cython2
# docker compose run --rm conda-python-cython2
image: ${REPO}:${ARCH}-conda-python-${PYTHON}-cython2
build:
context: .
dockerfile: ci/docker/conda-python-cython2.dockerfile
cache_from:
- ${REPO}:${ARCH}-conda-python-${PYTHON}-cython2
args:
repo: ${REPO}
arch: ${ARCH}
python: ${PYTHON}
shm_size: *shm-size
environment:
<<: [*common, *ccache]
PYTEST_ARGS: # inherit
volumes: *conda-volumes
command: *python-conda-command

conda-python-cpython-debug:
# Usage:
# docker compose build conda
Expand Down
4 changes: 0 additions & 4 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,6 @@ if(MSVC)
# seem harmless, and probably not worth the effort of working around it
string(APPEND CMAKE_CXX_FLAGS " /wd4800")

# See https://github.com/cython/cython/issues/2731. Change introduced in
# Cython 0.29.1 causes "unsafe use of type 'bool' in operation"
string(APPEND CMAKE_CXX_FLAGS " /wd4804")

# See https://github.com/cython/cython/issues/4445.
#
# Cython 3 emits "(void)__Pyx_PyObject_CallMethod0;" to suppress a
Expand Down
3 changes: 0 additions & 3 deletions python/pyarrow/_azurefs.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

# cython: language_level = 3

from cython cimport binding


from pyarrow.lib import frombytes, tobytes
from pyarrow.includes.libarrow_fs cimport *
Expand Down Expand Up @@ -115,7 +113,6 @@ cdef class AzureFileSystem(FileSystem):
self.azurefs = <CAzureFileSystem*> wrapped.get()

@staticmethod
@binding(True) # Required for cython < 3
def _reconstruct(kwargs):
# __reduce__ doesn't allow passing named arguments directly to the
# reconstructor, hence this wrapper.
Expand Down
2 changes: 0 additions & 2 deletions python/pyarrow/_dataset_parquet.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

"""Dataset support for Parquet file format."""

from cython cimport binding
from cython.operator cimport dereference as deref

import os
Expand Down Expand Up @@ -890,7 +889,6 @@ cdef class ParquetFragmentScanOptions(FragmentScanOptions):
return attrs == other_attrs

@staticmethod
@binding(True) # Required for Cython < 3
def _reconstruct(kwargs):
# __reduce__ doesn't allow passing named arguments directly to the
# reconstructor, hence this wrapper.
Expand Down
2 changes: 0 additions & 2 deletions python/pyarrow/_fs.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
# cython: language_level = 3

from cpython.datetime cimport datetime, PyDateTime_DateTime
from cython cimport binding

from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow_python cimport PyDateTime_to_TimePoint
Expand Down Expand Up @@ -422,7 +421,6 @@ cdef class FileSystem(_Weakrefable):
"SubTreeFileSystem")

@staticmethod
@binding(True) # Required for cython < 3
def _from_uri(uri):
fs, _path = FileSystem.from_uri(uri)
return fs
Expand Down
3 changes: 0 additions & 3 deletions python/pyarrow/_gcsfs.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

# cython: language_level = 3

from cython cimport binding

from pyarrow.lib cimport (pyarrow_wrap_metadata,
pyarrow_unwrap_metadata)
from pyarrow.lib import frombytes, tobytes, ensure_metadata
Expand Down Expand Up @@ -164,7 +162,6 @@ cdef class GcsFileSystem(FileSystem):
return datetime.fromtimestamp(expiration_ns / 1.0e9, timezone.utc)

@staticmethod
@binding(True) # Required for cython < 3
def _reconstruct(kwargs):
# __reduce__ doesn't allow passing named arguments directly to the
# reconstructor, hence this wrapper.
Expand Down
3 changes: 0 additions & 3 deletions python/pyarrow/_hdfs.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

# cython: language_level = 3

from cython cimport binding

from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow cimport *
from pyarrow.includes.libarrow_fs cimport *
Expand Down Expand Up @@ -137,7 +135,6 @@ replication=1)``
return self

@staticmethod
@binding(True) # Required for cython < 3
def _reconstruct(kwargs):
# __reduce__ doesn't allow passing named arguments directly to the
# reconstructor, hence this wrapper.
Expand Down
3 changes: 0 additions & 3 deletions python/pyarrow/_s3fs.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

# cython: language_level = 3

from cython cimport binding

from pyarrow.lib cimport (check_status, pyarrow_wrap_metadata,
pyarrow_unwrap_metadata)
from pyarrow.lib import frombytes, tobytes, KeyValueMetadata
Expand Down Expand Up @@ -419,7 +417,6 @@ cdef class S3FileSystem(FileSystem):
self.s3fs = <CS3FileSystem*> wrapped.get()

@staticmethod
@binding(True) # Required for cython < 3
def _reconstruct(kwargs):
# __reduce__ doesn't allow passing named arguments directly to the
# reconstructor, hence this wrapper.
Expand Down
1 change: 0 additions & 1 deletion python/pyarrow/io.pxi
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,6 @@ cdef class CacheOptions(_Weakrefable):
ideal_bandwidth_utilization_frac, max_ideal_request_size_mib))

@staticmethod
@binding(True) # Required for Cython < 3
def _reconstruct(kwargs):
# __reduce__ doesn't allow passing named arguments directly to the
# reconstructor, hence this wrapper.
Expand Down
2 changes: 0 additions & 2 deletions python/pyarrow/scalar.pxi
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
# under the License.

import collections
from cython cimport binding
from uuid import UUID


Expand Down Expand Up @@ -895,7 +894,6 @@ cdef class DictionaryScalar(Scalar):
"""

@staticmethod
@binding(True) # Required for cython < 3
def _reconstruct(type, is_valid, index, dictionary):
cdef:
CDictionaryScalarIndexAndDictionary value
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[build-system]
requires = [
"cython >= 0.29.31",
"cython >= 3",
# Starting with NumPy 1.25, NumPy is (by default) as far back compatible
# as oldest-support-numpy was (customizable with a NPY_TARGET_VERSION
# define). For older Python versions (where NumPy 1.25 is not yet available)
Expand Down
2 changes: 1 addition & 1 deletion python/requirements-build.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython>=0.29.31
cython>=3
oldest-supported-numpy>=0.14; python_version<'3.9'
numpy>=1.25; python_version>='3.9'
setuptools_scm>=8
Expand Down
2 changes: 1 addition & 1 deletion python/requirements-wheel-build.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython>=0.29.31
cython>=3
oldest-supported-numpy>=0.14; python_version<'3.9'
numpy>=2.0.0; python_version>='3.9'
setuptools_scm
Expand Down
4 changes: 2 additions & 2 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
)


if Cython.__version__ < '0.29.31':
if Cython.__version__ < '3':
raise Exception(
'Please update your Cython version. Supported Cython >= 0.29.31')
'Please update your Cython version. Supported Cython >= 3')

setup_dir = os.path.abspath(os.path.dirname(__file__))

Expand Down