From 2eb024e9f02f307839aac40e1574c73344880d52 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 30 Nov 2023 19:35:14 -0500 Subject: [PATCH] [python] Update pyarrow dependency (#1925) * [python] Update pyarrow dependency * Use pyarrow_hotfix * lint * round n+1 of code review * more hyperlinks --- apis/python/setup.py | 7 ++++++- apis/python/src/tiledbsoma/__init__.py | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apis/python/setup.py b/apis/python/setup.py index f7840d8c6b..6caded657f 100644 --- a/apis/python/setup.py +++ b/apis/python/setup.py @@ -280,7 +280,12 @@ def run(self): "numba==0.56.4; python_version<'3.8'", "numpy>=1.18,<1.24; python_version<'3.8'", "pandas", - "pyarrow>=9.0.0,<13.0.0", # MacOS issue with import pyarrow before import tiledb at >= 13.0 + # 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", + # MacOS issue with import pyarrow before import tiledb at >= 13.0: + # https://github.com/single-cell-data/TileDB-SOMA/issues/1926#issuecomment-1834695149 + "pyarrow>=9.0.0,<13.0.0", "scanpy>=1.9.2", "scipy", "somacore==1.0.4", diff --git a/apis/python/src/tiledbsoma/__init__.py b/apis/python/src/tiledbsoma/__init__.py index 50bf25770f..f6a6611373 100644 --- a/apis/python/src/tiledbsoma/__init__.py +++ b/apis/python/src/tiledbsoma/__init__.py @@ -96,6 +96,11 @@ from somacore import AxisColumnNames, AxisQuery, ExperimentAxisQuery from somacore.options import ResultOrder +# 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 +# ruff: noqa +import pyarrow_hotfix + from ._collection import Collection from ._constants import SOMA_JOINID from ._dataframe import DataFrame