Skip to content

Commit 9b49b59

Browse files
authored
Merge pull request #194 from scverse/fix/ci
Faster RTD & fix CI
2 parents 1e1c1b4 + b5cc14d commit 9b49b59

38 files changed

Lines changed: 109 additions & 113 deletions

.readthedocs.yaml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
# https://docs.readthedocs.io/en/stable/config-file/v2.html
21
version: 2
32
build:
4-
os: ubuntu-20.04
3+
os: ubuntu-24.04
54
tools:
6-
python: "3.10"
7-
sphinx:
8-
configuration: docs/conf.py
9-
# disable this for more lenient docs builds
10-
fail_on_warning: true
11-
python:
12-
install:
13-
- method: pip
14-
path: .
15-
extra_requirements:
16-
- doc
17-
- full
5+
python: "3.13"
6+
jobs:
7+
create_environment:
8+
- asdf plugin add uv
9+
- asdf install uv latest
10+
- asdf global uv latest
11+
- uv venv
12+
- uv pip install .[doc,full]
13+
build:
14+
html:
15+
- uv run sphinx-build -T -W -b html docs $READTHEDOCS_OUTPUT/html
16+
17+
submodules:
18+
include: all

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ All functions have been rewritten to follow the new API, errors when running pre
2727
- `viper` now correctly estimates shadow regulons when network weights are values other than -1 or +1
2828
- `wsum` and `wmean` are deprecated, instead now the method `waggr` allows to run both methods and any custom function. This makes it easier to quickly test new enrichment methods without having to deal with `decoupler`'s implementation
2929
- Databases from Omnipath can now be accessed through the new `op` module
30-
- Use `decoupler.op.<resource_name>` to access a database
30+
- Use `decoupler.op.<resource_name>` to access a database
3131
- Removed the `omnipath` package as a dependancy
3232
- Fixed `collectri` to the publication version instead of the OmniPath one
3333
- Made `progeny` only return significant genes by default instead of the top N genes per pathway
@@ -63,7 +63,7 @@ All functions have been rewritten to follow the new API, errors when running pre
6363
- Added `obsbar` to plot size of metadata columns in `anndata.AnnData.obs`
6464
- Added `order` to plot sources or features along a continous process such as a trajectory
6565
- Added `order_targets` to plot the targets of a given source along a continous process
66-
-
66+
-
6767
- New preprocessing functions in the `pp` module
6868
- Added two functions to format networks, `adjmat` to return an adjacency matrix, and `idxmax` to return a list of sets
6969
- Added `filter_samples` to filter pseudobulk profiles after running `pseudobulk`

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# decoupler - Ensemble of methods to infer enrichment scores
22
<img src="https://github.com/saezlab/decoupleR/blob/master/inst/figures/logo.svg?raw=1" align="right" width="120" class="no-scaled-link" />
3-
3+
44

55
[![Tests][badge-tests]][tests]
66
[![Documentation][badge-docs]][documentation]

docs/_static/css/custom.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ div.cell_output table.dataframe {
55

66
/* Adjust the logo size */
77
.logo img {
8-
width: 50%; /* or any percentage you want */
8+
width: 50%; /* or any percentage you want */
99
height: auto; /* maintain aspect ratio */
1010
}
1111

1212
img.no-scaled-link {
1313
background: transparent !important;
14-
}
14+
}

docs/api/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ pp
2121
2222
pl
2323
tl
24-
```
24+
```

docs/api/mt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
3131
mt.decouple
3232
mt.consensus
33-
```
33+
```

docs/api/op.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525
op.show_resources
2626
op.show_organisms
2727
op.translate
28-
```
28+
```

docs/api/pl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
pl.order
2121
pl.source_targets
2222
pl.volcano
23-
```
23+
```

docs/references.bib

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ @article{pydeseq
3535
author = {Muzellec, Boris and Teleńczuk, Maria and Cabeli, Vincent and Andreux, Mathieu},
3636
editor = {Ponty, Yann},
3737
year = {2023},
38-
month = sep
38+
month = sep
3939
}
4040

4141
@article{limma,
@@ -80,7 +80,7 @@ @article{decoupler
8080
author = {Badia-i-Mompel, Pau and Vélez Santiago, Jesús and Braunger, Jana and Geiss, Celina and Dimitrov, Daniel and M\"{u}ller-Dott, Sophia and Taus, Petr and Dugourd, Aurelien and Holland, Christian H and Ramirez Flores, Ricardo O and Saez-Rodriguez, Julio},
8181
editor = {Kuijjer, Marieke Lydia},
8282
year = {2022},
83-
month = jan
83+
month = jan
8484
}
8585

8686
@article{grn_review,
@@ -210,7 +210,7 @@ @article{panglaodb
210210
publisher = {Oxford University Press (OUP)},
211211
author = {Franzén, Oscar and Gan, Li-Ming and Bj\"{o}rkegren, Johan L M},
212212
year = {2019},
213-
month = jan
213+
month = jan
214214
}
215215

216216
@article{msvisium,
@@ -254,7 +254,7 @@ @article{hcop
254254
publisher = {Oxford University Press (OUP)},
255255
author = {Yates, Bethan and Gray, Kristian A and Jones, Tamsin E M and Bruford, Elspeth A},
256256
year = {2021},
257-
month = may
257+
month = may
258258
}
259259

260260
@article{omnipath,
@@ -325,7 +325,7 @@ @article{mofacell
325325
publisher = {eLife Sciences Publications, Ltd},
326326
author = {Ramirez Flores, Ricardo Omar and Lanzer, Jan David and Dimitrov, Daniel and Velten, Britta and Saez-Rodriguez, Julio},
327327
year = {2023},
328-
month = nov
328+
month = nov
329329
}
330330

331331
@article{scanpy,
@@ -339,7 +339,7 @@ @article{scanpy
339339
publisher = {Springer Science and Business Media LLC},
340340
author = {Wolf, F. Alexander and Angerer, Philipp and Theis, Fabian J.},
341341
year = {2018},
342-
month = feb
342+
month = feb
343343
}
344344

345345
@article{paga,
@@ -353,7 +353,7 @@ @article{paga
353353
publisher = {Springer Science and Business Media LLC},
354354
author = {Wolf, F. Alexander and Hamey, Fiona K. and Plass, Mireya and Solana, Jordi and Dahlin, Joakim S. and G\"{o}ttgens, Berthold and Rajewsky, Nikolaus and Simon, Lukas and Theis, Fabian J.},
355355
year = {2019},
356-
month = mar
356+
month = mar
357357
}
358358

359359
@article{pax5,
@@ -412,7 +412,7 @@ @article{gsva
412412
publisher = {Springer Science and Business Media LLC},
413413
author = {H\"{a}nzelmann, Sonja and Castelo, Robert and Guinney, Justin},
414414
year = {2013},
415-
month = jan
415+
month = jan
416416
}
417417

418418
@inproceedings{xgboost,
@@ -470,5 +470,5 @@ @article{zscore
470470
publisher = {Springer Science and Business Media LLC},
471471
author = {Yılmaz, Serhan and Ayati, Marzieh and Schlatzer, Daniela and undefinedi\c{c}ek, A. Erc\"{u}ment and Chance, Mark R. and Koyut\"{u}rk, Mehmet},
472472
year = {2021},
473-
month = feb
473+
month = feb
474474
}

pyproject.toml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,16 @@ classifiers = [
2323
"Programming Language :: Python :: 3.13",
2424
]
2525
dependencies = [
26+
"adjusttext",
2627
"anndata",
27-
"numba",
2828
"docrep",
29-
"tqdm",
30-
"requests",
3129
"marsilea",
32-
"adjustText",
30+
"numba",
31+
"requests",
32+
"scipy<1.16", # https://github.com/statsmodels/statsmodels/issues/9584
3333
# for debug logging (referenced from the issue template)
3434
"session-info2",
35-
]
36-
optional-dependencies.full = [
37-
"igraph",
38-
"xgboost",
39-
"ipywidgets",
40-
"dcor",
35+
"tqdm",
4136
]
4237
optional-dependencies.dev = [
4338
"pre-commit",
@@ -59,16 +54,22 @@ optional-dependencies.doc = [
5954
"sphinxcontrib-bibtex>=1",
6055
"sphinxext-opengraph",
6156
]
57+
optional-dependencies.full = [
58+
"dcor",
59+
"igraph",
60+
"ipywidgets",
61+
"xgboost",
62+
]
6263
optional-dependencies.test = [
6364
"coverage",
64-
"pytest",
65-
"statsmodels",
65+
"dcor",
6666
"gseapy",
67-
"scanpy",
6867
"igraph",
69-
"xgboost",
7068
"ipywidgets",
71-
"dcor"
69+
"pytest",
70+
"scanpy",
71+
"statsmodels",
72+
"xgboost",
7273
]
7374
# https://docs.pypi.org/project_metadata/#project-urls
7475
urls.Documentation = "https://decoupler.readthedocs.io/"

0 commit comments

Comments
 (0)