Skip to content

Commit 04de245

Browse files
authored
Move to uv as package manager (#29)
* Switch to uv * Adjust versions
1 parent 518d725 commit 04de245

File tree

6 files changed

+2470
-745
lines changed

6 files changed

+2470
-745
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ jobs:
88
runs-on: self-hosted
99
steps:
1010
- uses: actions/checkout@v4
11-
- name: Setup rye
12-
uses: eifinger/setup-rye@v4
13-
with:
14-
enable-cache: true
15-
version: '0.39.0'
11+
- name: Set up uv
12+
uses: astral-sh/setup-uv@v6
1613
- name: Setup environment
1714
run: make .venv
1815
- name: Build figures

makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ all: $(allOutput)
77

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

1212
test: .venv
13-
rye run pytest -s -v -x
13+
uv run pytest -s -v -x
1414

1515
.venv:
16-
rye sync
16+
uv sync
1717

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

2121
pyright: .venv
22-
rye run pyright pf2scrnaseq
22+
uv run pyright pf2scrnaseq
2323

2424
clean:
2525
rm -rf output profile profile.svg

pyproject.toml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ version = "0.1.0"
44
description = "Single cell analysis across conditions using PARAFAC2."
55
authors = [{name = "Andrew Ramirez"}, {name = "Aaron Meyer", email = "[email protected]" }]
66
license = "MIT"
7+
readme = "README.md"
78
requires-python = ">= 3.12"
89

9-
1010
dependencies = [
11-
"numpy>=2.1",
12-
"scipy>=1.15",
11+
"numpy>=2.2",
12+
"scipy>=1.16",
1313
"scikit-learn>=1.6",
1414
"seaborn>=0.13.2",
1515
"pandas>=2.2",
@@ -19,7 +19,7 @@ dependencies = [
1919
"datashader>=0.18",
2020
"gseapy>=1.1",
2121
"scanpy @ git+https://github.com/scverse/scanpy.git@c2a7a4b7ec3203121a8d75aa05fbeb602ceecbd4",
22-
"pacmap>=0.7.1",
22+
"pacmap>=0.8",
2323
"leidenalg>=0.10.1",
2424
"tqdm>=4.66.1",
2525
"tlviz>=0.1.1",
@@ -31,9 +31,12 @@ dependencies = [
3131
"doubletdetection>=4.3.0.post1",
3232
]
3333

34-
35-
36-
readme = "README.md"
34+
[dependency-groups]
35+
dev = [
36+
"pytest>=8.0",
37+
"pytest-cov>=6.0",
38+
"pyright>=1.1",
39+
]
3740

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

46-
[tool.rye]
47-
managed = true
48-
dev-dependencies = [
49-
"pytest>=8.0",
50-
"pytest-cov>=6.0",
51-
"pyright>=1.1",
52-
]
53-
54-
5549
[tool.hatch.metadata]
5650
allow-direct-references = true
5751

0 commit comments

Comments
 (0)