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
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ jobs:
runs-on: self-hosted
steps:
- uses: actions/checkout@v4
- name: Setup rye
uses: eifinger/setup-rye@v4
with:
enable-cache: true
version: '0.39.0'
- name: Set up uv
uses: astral-sh/setup-uv@v6
- name: Setup environment
run: make .venv
- name: Build figures
Expand Down
10 changes: 5 additions & 5 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ all: $(allOutput)

output/figure%.svg: pf2scrnaseq/figures/figure%.py
@ mkdir -p ./output
rye run fbuild $*
uv run fbuild $*

test: .venv
rye run pytest -s -v -x
uv run pytest -s -v -x

.venv:
rye sync
uv sync

coverage.xml: .venv
rye run pytest --junitxml=junit.xml --cov=pf2scrnaseq --cov-report xml:coverage.xml
uv run pytest --junitxml=junit.xml --cov=pf2scrnaseq --cov-report xml:coverage.xml

pyright: .venv
rye run pyright pf2scrnaseq
uv run pyright pf2scrnaseq

clean:
rm -rf output profile profile.svg
Expand Down
26 changes: 10 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ version = "0.1.0"
description = "Single cell analysis across conditions using PARAFAC2."
authors = [{name = "Andrew Ramirez"}, {name = "Aaron Meyer", email = "[email protected]" }]
license = "MIT"
readme = "README.md"
requires-python = ">= 3.12"


dependencies = [
"numpy>=2.1",
"scipy>=1.15",
"numpy>=2.2",
"scipy>=1.16",
"scikit-learn>=1.6",
"seaborn>=0.13.2",
"pandas>=2.2",
Expand All @@ -19,7 +19,7 @@ dependencies = [
"datashader>=0.18",
"gseapy>=1.1",
"scanpy @ git+https://github.com/scverse/scanpy.git@c2a7a4b7ec3203121a8d75aa05fbeb602ceecbd4",
"pacmap>=0.7.1",
"pacmap>=0.8",
"leidenalg>=0.10.1",
"tqdm>=4.66.1",
"tlviz>=0.1.1",
Expand All @@ -31,9 +31,12 @@ dependencies = [
"doubletdetection>=4.3.0.post1",
]



readme = "README.md"
[dependency-groups]
dev = [
"pytest>=8.0",
"pytest-cov>=6.0",
"pyright>=1.1",
]

[project.scripts]
fbuild = "pf2rnaseq.figures.common:genFigure"
Expand All @@ -43,15 +46,6 @@ factor = "pf2rnaseq.imports:factorSave"
requires = ["hatchling"]
build-backend = "hatchling.build"

[tool.rye]
managed = true
dev-dependencies = [
"pytest>=8.0",
"pytest-cov>=6.0",
"pyright>=1.1",
]


[tool.hatch.metadata]
allow-direct-references = true

Expand Down
Loading
Loading