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
1 change: 1 addition & 0 deletions .github/workflows/docker-drop-seq_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
- '.github/workflows/docker-drop-seq_java.yaml'
- 'src/java/**'
- 'src/tests/java/**'
- 'src/docker/java/**'
workflow_dispatch:

jobs:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-drop-seq_python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
- '.github/workflows/docker-drop-seq_reusable.yaml'
- '.github/workflows/docker-drop-seq_python.yaml'
- 'src/python/**'
- 'src/docker/python/**'
workflow_dispatch:

jobs:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-drop-seq_r.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
- '.github/workflows/docker-drop-seq_reusable.yaml'
- '.github/workflows/docker-drop-seq_r.yaml'
- 'src/R/**'
- 'src/docker/R/**'
workflow_dispatch:

jobs:
Expand Down
9 changes: 7 additions & 2 deletions src/docker/python/build/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export PATH=$PATH:$uv_dir:$BASEDIR

# Install prerequisites
echo "Installing prerequisites..."
apt-get -qq update && apt-get -qq install curl
apt-get -qq update && apt-get -qq install curl build-essential cmake

# Install uv
curl -LsSf https://astral.sh/uv/install.sh | env UV_UNMANAGED_INSTALL=$uv_dir sh
Expand All @@ -60,5 +60,10 @@ curl -LsSf https://astral.sh/uv/install.sh | env UV_UNMANAGED_INSTALL=$uv_dir sh
for pyproject_toml in "$envs_dir"/pyproject.toml; do
env_name=dropseq
echo "Building $env_name"
uv tool install "$envs_dir"
# Limit python version to <3.14 until numba issue resolved.
# Note that pyproject.toml upper bounds are not respected by uv, so install.sh also needs to be updated too.
# See also:
# - https://github.com/numba/numba/issues/9957
# - https://github.com/astral-sh/uv/issues/11506
uv tool install --python ">=3.12,<3.14" "$envs_dir"
done
9 changes: 6 additions & 3 deletions src/python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ authors = [
]
description = "Drop-seq command-line tools and python libraries."
readme = "README.md"
requires-python = ">=3.12"
# Limit python version to <3.14 until numba issue resolved.
# Note that pyproject.toml upper bounds are not respected by uv, so install.sh also needs to be updated too.
# See also:
# - https://github.com/numba/numba/issues/9957
# - https://github.com/astral-sh/uv/issues/11506
requires-python = ">=3.12,<3.14"
classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
Expand Down Expand Up @@ -54,5 +59,3 @@ aggregate_filter_adata = "dropseq.hdf5.aggregate_filter_adata:main"
metacells_from_h5ad = "dropseq.hdf5.metacells_from_h5ad:main"
kmeans_cluster_effects = "dropseq.effect_clustering.kmeans_effect_clustering:main"
dropseq_terra_utils = "dropseq.terra_utils.cli:main"