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.

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

Doc submodule #2901

Merged
merged 49 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
3a9030d
Start going to tutorial submodule
ivirshup Mar 11, 2024
6add1fb
bump submodule
ivirshup Mar 12, 2024
f92e31e
Got plotting tutorial layout to a decent point
ivirshup Mar 13, 2024
eccf860
clear out git submodule
ivirshup Mar 13, 2024
9ae54b5
Using stubs to reference notebooks
ivirshup Mar 13, 2024
127da98
Use symlinks instead
ivirshup Mar 13, 2024
c5889bd
Add knn-transformers
ivirshup Mar 13, 2024
e4cf70d
Remove docutils.conf as it's no longer needed
ivirshup Mar 13, 2024
5f659e5
Update basic tutorial
ivirshup Mar 13, 2024
6382bcb
Update reference to ecosystem
ivirshup Mar 13, 2024
bb5bbac
Add bib
ivirshup Mar 13, 2024
a612698
Start a how-to section
ivirshup Mar 14, 2024
59ddfae
Update old tutorial link
ivirshup Mar 18, 2024
393e850
experimental tutorial module
ivirshup Mar 18, 2024
784a6b6
update spatial tutorials links
ivirshup Mar 18, 2024
0697a11
Update basic tutorials layout
ivirshup Mar 18, 2024
94439a3
Add trajectories
ivirshup Mar 18, 2024
37be5ec
Fix some links
ivirshup Mar 18, 2024
c7b6b14
fix some more links
ivirshup Mar 18, 2024
baeed7b
unfuck cite directive
ivirshup Mar 18, 2024
27b9761
update submodule
ivirshup Mar 18, 2024
dddcb37
Fix sphinx handling of ftp link
ivirshup Mar 18, 2024
c1d042a
Add submodule to readthedocs
ivirshup Mar 18, 2024
7d8aa97
add rapids-singlecell to news
ivirshup Mar 19, 2024
2e2aa41
Merge branch 'main' into doc-submodule
ivirshup Mar 19, 2024
da64e39
Update advanced plotting tutorial
ivirshup Mar 19, 2024
60457ee
apply pre-commit fixes on notebooks
ivirshup Mar 19, 2024
e603029
Fix link
ivirshup Mar 19, 2024
961e220
Cut down on tutorials
ivirshup Mar 19, 2024
962d3d9
Release notes (+ a release note fix)
ivirshup Mar 19, 2024
9d707f1
Merge branch 'main' into doc-submodule
ivirshup Mar 20, 2024
75d7a74
Merge branch 'main' into doc-submodule
ivirshup Mar 22, 2024
79e3519
Fix rapids-singlecell link
ivirshup Mar 22, 2024
e8a4694
Updae tutorials page
ivirshup Mar 22, 2024
c9f6d11
Merge branch 'main' into doc-submodule
ivirshup Mar 22, 2024
37c0f49
add setuptools dep for doc builds
ivirshup Mar 25, 2024
4caaf20
Use intersphinx for a link
ivirshup Mar 25, 2024
edc8d79
update notebooks
ivirshup Mar 25, 2024
041d7a7
add back blank line
ivirshup Mar 25, 2024
30bdd44
update submodule
ivirshup Mar 25, 2024
24b5564
Add dask notebook
ivirshup Mar 25, 2024
4c50e7a
Update notebook submodule
ivirshup Mar 25, 2024
6da7f17
Merge branch 'main' into doc-submodule
ivirshup Mar 25, 2024
5a062f8
Update notebook submodule
ivirshup Mar 25, 2024
d812981
update submodule
ivirshup Mar 25, 2024
47db99a
Prep release notes
ivirshup Mar 25, 2024
49773b4
update submodule
ivirshup Mar 25, 2024
d98c8c0
add release note for doc style overhaul
ivirshup Mar 25, 2024
b22084d
bump date
ivirshup Mar 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "notebooks"]
path = notebooks
url = https://github.com/scverse/scanpy-tutorials/
2 changes: 2 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
version: 2
submodules:
include: all
build:
os: ubuntu-20.04
tools:
Expand Down
142 changes: 0 additions & 142 deletions docs/_tutorials.md
flying-sheep marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

2 changes: 1 addition & 1 deletion docs/api/plotting.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
The plotting module {mod}`scanpy.pl` largely parallels the `tl.*` and a few of the `pp.*` functions.
For most tools and for some preprocessing functions, you'll find a plotting function with the same name.

See {doc}`tutorials:plotting/core` for an overview of how to use these functions.
See {doc}`/tutorials/plotting/core` for an overview of how to use these functions.

```{note}
See the {ref}`settings` section for all important plotting configurations.
Expand Down
10 changes: 7 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

# -- General configuration ------------------------------------------------


nitpicky = True # Warn about broken links. This is here for a reason: Do not change.
needs_sphinx = "4.0" # Nicer param docs
suppress_warnings = [
Expand All @@ -42,6 +41,11 @@

release = version

# Bibliography settings
bibtex_bibfiles = ["references.bib"]
bibtex_reference_style = "author_year"


# default settings
templates_path = ["_templates"]
master_doc = "index"
Expand All @@ -59,6 +63,7 @@
"sphinx.ext.napoleon",
"sphinx.ext.autosummary",
"sphinx.ext.extlinks",
"sphinxcontrib.bibtex",
"matplotlib.sphinxext.plot_directive",
"sphinx_autodoc_typehints", # needs to be after napoleon
"git_ref", # needs to be before scanpydoc.rtd_github_links
Expand Down Expand Up @@ -90,7 +95,7 @@
"html_image",
"html_admonition",
]
myst_url_schemes = ("http", "https", "mailto")
myst_url_schemes = ("http", "https", "mailto", "ftp")
nb_output_stderr = "remove"
nb_execution_mode = "off"
nb_merge_streams = True
Expand Down Expand Up @@ -127,7 +132,6 @@
scipy=("https://docs.scipy.org/doc/scipy/", None),
seaborn=("https://seaborn.pydata.org/", None),
sklearn=("https://scikit-learn.org/stable/", None),
tutorials=("https://scanpy-tutorials.readthedocs.io/en/latest/", None),
)


Expand Down
2 changes: 1 addition & 1 deletion docs/extensions/cite.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ def cite_role( # noqa: PLR0917


def setup(app: Sphinx):
app.add_role("cite", cite_role, override=True)
app.add_role("cite-hack", cite_role, override=True)
7 changes: 7 additions & 0 deletions docs/how-to/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# How to

This section contains short examples on how to perform specific tasks with scanpy.
flying-sheep marked this conversation as resolved.
Show resolved Hide resolved

```{toctree}
knn-transformers
```
1 change: 1 addition & 0 deletions docs/how-to/knn-transformers.ipynb
10 changes: 6 additions & 4 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ New to *scanpy*? Check out the installation guide.
:::

:::{grid-item-card} Tutorials {octicon}`play;1em;`
:link: _tutorials
:link: tutorials/index
:link-type: doc

The tutorials walk you through real-world applications of scanpy.
Expand Down Expand Up @@ -49,8 +49,9 @@ Find a bug? Interested in improving scanpy? Checkout our GitHub for the latest d
::::

**Other resources**

* Follow changes in the {ref}`release notes <release-notes>`.
* Find tools that harmonize well with anndata & Scanpy via the {doc}`external API <external/index>` and the {doc}`ecosystem page <ecosystem>`.
* Find tools that harmonize well with anndata & Scanpy at [scverse.org/packages/](https://scverse.org/packages/)
* Check out our {ref}`contributing guide <contribution-guide>` for development practices.
* Consider citing [Genome Biology (2018)] along with original {doc}`references <references>`.

Expand All @@ -71,9 +72,10 @@ Find a bug? Interested in improving scanpy? Checkout our GitHub for the latest d
:hidden: true
:maxdepth: 1

_tutorials
usage-principles
installation
tutorials/index
usage-principles
how-to/index
api/index
external/index
ecosystem
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pip install 'scanpy[leiden]'
```

The extra `[leiden]` installs two packages that are needed for popular
parts of scanpy but aren't requirements: [igraph] {cite}`Csardi06` and [leiden] {cite}`Traag18`.
parts of scanpy but aren't requirements: [igraph] {cite-hack}`Csardi06` and [leiden] {cite-hack}`Traag18`.

(dev-install-instructions)=

Expand Down
2 changes: 1 addition & 1 deletion docs/news.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Bioconda, Seurat, Bioconductor, and others.

### Science “Breakthrough of the Year 2018” {small}`2018-12-01`

The Science “Breakthrough of the Year 2018”, [Development cell by cell](https://vis.sciencemag.org/breakthrough2018/finalists/#cell-development), mentions the first application of PAGA {cite}`Plass18` among 5 papers.
The Science “Breakthrough of the Year 2018”, [Development cell by cell](https://vis.sciencemag.org/breakthrough2018/finalists/#cell-development), mentions the first application of PAGA {cite-hack}`Plass18` among 5 papers.

[32 projects]: https://chanzuckerberg.com/eoss/proposals/
[essential open source software for science]: https://chanzuckerberg.com/newsroom/chan-zuckerberg-initiative-awards-5-million-for-open-source-software-projects-essential-to-science/
100 changes: 100 additions & 0 deletions docs/references.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
@article{Wolf2018,
author = {Wolf, F. Alexander
and Angerer, Philipp
and Theis, Fabian J.},
title = {SCANPY: large-scale single-cell gene expression data analysis},
journal = {Genome Biology},
year = {2018},
month = {Feb},
day = {06},
volume = {19},
number = {1},
pages = {15},
abstract = {Scanpy is a scalable toolkit for analyzing single-cell gene expression data. It includes methods for preprocessing, visualization, clustering, pseudotime and trajectory inference, differential expression testing, and simulation of gene regulatory networks. Its Python-based implementation efficiently deals with data sets of more than one million cells (https://github.com/theislab/Scanpy). Along with Scanpy, we present AnnData, a generic class for handling annotated data matrices (https://github.com/theislab/anndata).},
issn = {1474-760X},
doi = {10.1186/s13059-017-1382-0},
url = {https://doi.org/10.1186/s13059-017-1382-0}
}
@inproceedings{luecken2021,
author = {Luecken, Malte and Burkhardt, Daniel and Cannoodt, Robrecht and Lance, Christopher and Agrawal, Aditi and Aliee, Hananeh and Chen, Ann and Deconinck, Louise and Detweiler, Angela and Granados, Alejandro and Huynh, Shelly and Isacco, Laura and Kim, Yang and Klein, Dominik and DE KUMAR, BONY and Kuppasani, Sunil and Lickert, Heiko and McGeever, Aaron and Melgarejo, Joaquin and Mekonen, Honey and Morri, Maurizio and M\"{u}ller, Michaela and Neff, Norma and Paul, Sheryl and Rieck, Bastian and Schneider, Kaylie and Steelman, Scott and Sterr, Michael and Treacy, Daniel and Tong, Alexander and Villani, Alexandra-Chloe and Wang, Guilin and Yan, Jia and Zhang, Ce and Pisco, Angela and Krishnaswamy, Smita and Theis, Fabian and Bloom, Jonathan M},
booktitle = {Proceedings of the Neural Information Processing Systems Track on Datasets and Benchmarks},
editor = {J. Vanschoren and S. Yeung},
pages = {},
publisher = {Curran},
title = {A sandbox for prediction and integration of DNA, RNA, and proteins in single cells},
url = {https://datasets-benchmarks-proceedings.neurips.cc/paper_files/paper/2021/file/158f3069a435b314a80bdcb024f8e422-Paper-round2.pdf},
volume = {1},
year = {2021}
}
@article{McCarthy2017,
doi = {10.1093/bioinformatics/btw777},
url = {https://doi.org/10.1093/bioinformatics/btw777},
year = {2017},
month = jan,
publisher = {Oxford University Press ({OUP})},
volume = {33},
number = {8},
pages = {1179--1186},
author = {Davis J McCarthy and Kieran R Campbell and Aaron T L Lun and Quin F Wills},
editor = {Ivo Hofacker},
title = {Scater: pre-processing, quality control, normalization and visualization of single-cell {RNA}-seq data in R},
journal = {Bioinformatics}
}
@article{Wolock2019,
doi = {10.1016/j.cels.2018.11.005},
url = {https://doi.org/10.1016/j.cels.2018.11.005},
year = {2019},
month = apr,
publisher = {Elsevier {BV}},
volume = {8},
number = {4},
pages = {281--291.e9},
author = {Samuel L. Wolock and Romain Lopez and Allon M. Klein},
title = {Scrublet: Computational Identification of Cell Doublets in Single-Cell Transcriptomic Data},
journal = {Cell Systems}
}
@article{Satija2015,
doi = {10.1038/nbt.3192},
url = {https://doi.org/10.1038/nbt.3192},
year = {2015},
month = apr,
publisher = {Springer Science and Business Media {LLC}},
volume = {33},
number = {5},
pages = {495--502},
author = {Rahul Satija and Jeffrey A Farrell and David Gennert and Alexander F Schier and Aviv Regev},
title = {Spatial reconstruction of single-cell gene expression data},
journal = {Nature Biotechnology}
}
@article{Zheng2017,
doi = {10.1038/ncomms14049},
url = {https://doi.org/10.1038/ncomms14049},
year = {2017},
month = jan,
publisher = {Springer Science and Business Media {LLC}},
volume = {8},
number = {1},
author = {Grace X. Y. Zheng and Jessica M. Terry and Phillip Belgrader and Paul Ryvkin and Zachary W. Bent and Ryan Wilson and Solongo B. Ziraldo and Tobias D. Wheeler and Geoff P. McDermott and Junjie Zhu and Mark T. Gregory and Joe Shuga and Luz Montesclaros and Jason G. Underwood and Donald A. Masquelier and Stefanie Y. Nishimura and Michael Schnall-Levin and Paul W. Wyatt and Christopher M. Hindson and Rajiv Bharadwaj and Alexander Wong and Kevin D. Ness and Lan W. Beppu and H. Joachim Deeg and Christopher McFarland and Keith R. Loeb and William J. Valente and Nolan G. Ericson and Emily A. Stevens and Jerald P. Radich and Tarjei S. Mikkelsen and Benjamin J. Hindson and Jason H. Bielas},
title = {Massively parallel digital transcriptional profiling of single cells},
journal = {Nature Communications}
}
@article{stuart2019comprehensive,
title = {Comprehensive integration of single-cell data},
author = {Stuart, Tim and Butler, Andrew and Hoffman, Paul and Hafemeister, Christoph and Papalexi, Efthymia and Mauck, William M and Hao, Yuhan and Stoeckius, Marlon and Smibert, Peter and Satija, Rahul},
flying-sheep marked this conversation as resolved.
Show resolved Hide resolved
journal = {Cell},
volume = {177},
number = {7},
pages = {1888--1902},
year = {2019},
publisher = {Elsevier}
}
@article{traag2019louvain,
title = {From Louvain to Leiden: guaranteeing well-connected communities},
author = {Traag, Vincent A and Waltman, Ludo and Van Eck, Nees Jan},
journal = {Scientific reports},
volume = {9},
number = {1},
pages = {5233},
year = {2019},
publisher = {Nature Publishing Group UK London}
}
2 changes: 2 additions & 0 deletions docs/references.rst
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,5 @@ References
.. [Zunder15] Zunder *et al.* (2015),
*A continuous molecular roadmap to iPSC reprogramming through progression analysis of single-cell mass cytometry*,
`Cell Stem Cell <https://doi.org/10.1016/j.stem.2015.01.015>`__.

.. bibliography::
2 changes: 1 addition & 1 deletion docs/release-notes/0.4.0.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### 0.4.0 {small}`2017-12-23`

- export to [SPRING] {cite}`Weinreb17` for interactive visualization of data:
- export to [SPRING] {cite-hack}`Weinreb17` for interactive visualization of data:
[spring tutorial] {smaller}`S Wollock`

[spring]: https://github.com/AllonKleinLab/SPRING/
Expand Down
2 changes: 1 addition & 1 deletion docs/release-notes/0.4.3.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### 0.4.3 {small}`2018-02-09`

- {func}`~scanpy.pl.clustermap`: heatmap from hierarchical clustering,
based on {func}`seaborn.clustermap` {cite}`Waskom16` {smaller}`A Wolf`
based on {func}`seaborn.clustermap` {cite-hack}`Waskom16` {smaller}`A Wolf`
- only return {class}`matplotlib.axes.Axes` in plotting functions of `sc.pl`
when `show=False`, otherwise `None` {smaller}`A Wolf`