Skip to content
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

Jump to bottom

[python] Try 3.12 again [WIP] #2692

Closed
wants to merge 3 commits into from
Closed

[python] Try 3.12 again [WIP] #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a62cee
[python] Try 3.12 again [WIP]
johnkerl Jun 6, 2024
3673e2c
loosen pin and fingers crossed for macos
johnkerl Jun 6, 2024
3b2f36a
lint
johnkerl Jun 6, 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
2 changes: 1 addition & 1 deletion .github/workflows/python-ci-full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
# os: [ubuntu-22.04, macos-12, windows-2019]
# TODO: add 3.12
# https://github.com/single-cell-data/TileDB-SOMA/issues/1849
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
include:
- runs-on: ubuntu-22.04
cc: gcc-11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [ '38', '39', '310', '311' ]
python-version: [ '38', '39', '310', '311', '312' ]
cibw_build: [ manylinux_x86_64, macosx_x86_64, macosx_arm64 ]
include:
- cibw_build: manylinux_x86_64
Expand Down
7 changes: 2 additions & 5 deletions apis/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,10 @@ def run(self):
"attrs>=22.2",
"numba>=0.58.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'",
##### TRYING AGAIN "pyarrow>=9.0.0,<13.0.0; platform_system=='Darwin'",
##### TRYING AGAIN "pyarrow>=9.0.0; platform_system!='Darwin'",
"scanpy>=1.9.2",
"scipy",
# Note: the somacore version is in .pre-commit-config.yaml too
Expand Down
6 changes: 0 additions & 6 deletions apis/python/src/tiledbsoma/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@
import os
import sys


# Load native libraries. On wheel builds, we may have a shared library
# already linked. In this case, we can import directly
try:
Expand Down Expand Up @@ -138,11 +137,6 @@
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
Expand Down
Loading