Skip to content

[python] Remove pyarrow pin on MacOS #3004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnkerl merged 2 commits into from
Sep 17, 2024
Merged

[python] Remove pyarrow pin on MacOS #3004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26dc9df
Export two missing symbols
johnkerl Sep 17, 2024
5c0a10e
iterate on pyarrow unpin
johnkerl Sep 17, 2024
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
8 changes: 1 addition & 7 deletions apis/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,7 @@ def run(self):
"numba>=0.58.0",
"numpy<2.0",
"pandas",
# 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; platform_system=='Darwin'",
"pyarrow>=9.0.0; platform_system!='Darwin'",
"pyarrow",
"scanpy>=1.9.2",
"scipy",
# Note: the somacore version is in .pre-commit-config.yaml too
Expand Down
11 changes: 7 additions & 4 deletions apis/python/src/tiledbsoma/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,11 @@ def _new_shape_feature_flag_enabled() -> bool:
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
# This is important since we need to do the above dll/dylib/so business
# _before_ imports, but, ruff will tell us that imports need to be
# at the top of the file:
#
Copy link
Copy Markdown
Contributor Author

@johnkerl johnkerl Sep 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Link for #3001

# ruff: noqa
import pyarrow_hotfix

from ._collection import Collection
from ._constants import SOMA_JOINID
Expand Down Expand Up @@ -185,8 +186,8 @@ def _new_shape_feature_flag_enabled() -> bool:
tiledbsoma_stats_reset,
)
from .stats import (
tiledbsoma_stats_json,
tiledbsoma_stats_as_py,
tiledbsoma_stats_json,
)

__version__ = get_implementation_version()
Expand Down Expand Up @@ -223,4 +224,6 @@ def _new_shape_feature_flag_enabled() -> bool:
"tiledbsoma_stats_dump",
"tiledbsoma_stats_enable",
"tiledbsoma_stats_reset",
"tiledbsoma_stats_as_py",
"tiledbsoma_stats_json",
]