diff --git a/pyproject.toml b/pyproject.toml index d4a6fd21..80236b31 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,9 @@ dependencies = [ "numpy>=1.21", "pandas", "pyarrow", + # TODO: once we no longer support Python 3.7, remove this and pin to pyarrow >= 14.0.1 + # https://github.com/single-cell-data/TileDB-SOMA/issues/1926 + "pyarrow-hotfix", "scipy", "typing-extensions>=4.1", # For LiteralString ] diff --git a/python-spec/requirements-py3.10.txt b/python-spec/requirements-py3.10.txt index cb49783e..634cc44f 100644 --- a/python-spec/requirements-py3.10.txt +++ b/python-spec/requirements-py3.10.txt @@ -7,7 +7,7 @@ numba==0.58.0 numpy==1.25.2 packaging==23.1 pandas==2.1.1 -pyarrow>=14.0.1 +pyarrow==13.0.0 python-dateutil==2.8.2 pytz==2023.3.post1 scipy==1.11.3 diff --git a/python-spec/requirements-py3.7.txt b/python-spec/requirements-py3.7.txt index 40007d5d..b7d5617d 100644 --- a/python-spec/requirements-py3.7.txt +++ b/python-spec/requirements-py3.7.txt @@ -8,7 +8,7 @@ numba==0.56.4 numpy==1.21.6 packaging==23.1 pandas==1.3.5 -pyarrow!=14.0.0 +pyarrow==12.0.1 python-dateutil==2.8.2 pytz==2023.3.post1 scipy==1.7.3 diff --git a/python-spec/requirements-py3.8-lint.txt b/python-spec/requirements-py3.8-lint.txt index f0ba4f3a..b5d21a14 100644 --- a/python-spec/requirements-py3.8-lint.txt +++ b/python-spec/requirements-py3.8-lint.txt @@ -21,7 +21,7 @@ pandas==2.0.3 pathspec==0.11.2 platformdirs==3.10.0 pre-commit==3.4.0 -pyarrow>=14.0.1 +pyarrow==13.0.0 python-dateutil==2.8.2 pytz==2023.3.post1 PyYAML==6.0.1 diff --git a/python-spec/requirements-py3.8.txt b/python-spec/requirements-py3.8.txt index 12191709..a652c0de 100644 --- a/python-spec/requirements-py3.8.txt +++ b/python-spec/requirements-py3.8.txt @@ -8,7 +8,7 @@ numba==0.58.0 numpy==1.24.4 packaging==23.1 pandas==2.0.3 -pyarrow>=14.0.1 +pyarrow==13.0.0 python-dateutil==2.8.2 pytz==2023.3.post1 scipy==1.10.1 diff --git a/python-spec/requirements-py3.9.txt b/python-spec/requirements-py3.9.txt index 6a6c07e0..194ec037 100644 --- a/python-spec/requirements-py3.9.txt +++ b/python-spec/requirements-py3.9.txt @@ -9,7 +9,7 @@ numba==0.58.0 numpy==1.25.2 packaging==23.1 pandas==2.1.1 -pyarrow>=14.0.1 +pyarrow==13.0.0 python-dateutil==2.8.2 pytz==2023.3.post1 rsa==4.7.2 diff --git a/python-spec/src/somacore/collection.py b/python-spec/src/somacore/collection.py index 1ccec0a4..19f2e2a6 100644 --- a/python-spec/src/somacore/collection.py +++ b/python-spec/src/somacore/collection.py @@ -1,7 +1,11 @@ import abc from typing import Any, MutableMapping, Optional, Sequence, Type, TypeVar, overload +# ruff: noqa import pyarrow as pa + +# ruff: noqa +import pyarrow_hotfix from typing_extensions import Final, Self from . import base diff --git a/python-spec/src/somacore/data.py b/python-spec/src/somacore/data.py index e8bffd66..86f49d9d 100644 --- a/python-spec/src/somacore/data.py +++ b/python-spec/src/somacore/data.py @@ -19,6 +19,9 @@ ) import pyarrow as pa + +# ruff: noqa +import pyarrow_hotfix from typing_extensions import Final, Literal, Self from . import base diff --git a/python-spec/src/somacore/options.py b/python-spec/src/somacore/options.py index 4e09ca37..f562736f 100644 --- a/python-spec/src/somacore/options.py +++ b/python-spec/src/somacore/options.py @@ -11,6 +11,9 @@ import numpy as np import numpy.typing as npt import pyarrow as pa + +# ruff: noqa +import pyarrow_hotfix from typing_extensions import Final, Literal from . import types diff --git a/python-spec/src/somacore/query/_fast_csr.py b/python-spec/src/somacore/query/_fast_csr.py index 17fb0aa2..8140c803 100644 --- a/python-spec/src/somacore/query/_fast_csr.py +++ b/python-spec/src/somacore/query/_fast_csr.py @@ -8,6 +8,9 @@ import numpy.typing as npt import pandas as pd import pyarrow as pa + +# ruff: noqa +import pyarrow_hotfix from scipy import sparse from .. import data as scd diff --git a/python-spec/src/somacore/query/axis.py b/python-spec/src/somacore/query/axis.py index 7ae660e8..1a5eabc7 100644 --- a/python-spec/src/somacore/query/axis.py +++ b/python-spec/src/somacore/query/axis.py @@ -4,6 +4,9 @@ import numpy as np import pyarrow as pa +# ruff: noqa +import pyarrow_hotfix + from .. import options from .. import types diff --git a/python-spec/src/somacore/query/query.py b/python-spec/src/somacore/query/query.py index 1032517e..d51f15c4 100644 --- a/python-spec/src/somacore/query/query.py +++ b/python-spec/src/somacore/query/query.py @@ -18,6 +18,9 @@ import numpy.typing as npt import pandas as pd import pyarrow as pa + +# ruff: noqa +import pyarrow_hotfix from scipy import sparse from typing_extensions import Literal, Protocol, Self, TypedDict, assert_never