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

Document datasets #3060

Merged
merged 33 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5253fe0
Simplify dataset code and docs
flying-sheep May 14, 2024
c541e15
remove weird references
flying-sheep May 14, 2024
6a02822
Fix test warnings
flying-sheep May 14, 2024
e0e13f3
Add some failing tests
flying-sheep May 14, 2024
d85b718
Merge branch 'main' into doc-datasets
flying-sheep May 14, 2024
e40135f
Add non-internet tests
flying-sheep May 14, 2024
489b062
warnings
flying-sheep May 14, 2024
a948527
add repr of all datasets
flying-sheep May 14, 2024
1c2ea16
Fix up EBI expr atlas too
flying-sheep May 14, 2024
f9cef37
better doctest
flying-sheep May 14, 2024
3fbead3
Link fixes
flying-sheep May 14, 2024
7bb0baa
Merge branch 'main' into doc-datasets
flying-sheep May 17, 2024
6876946
relnotes
flying-sheep May 17, 2024
1d263bd
type-only
flying-sheep May 17, 2024
0f3c8ed
globally modify datasetdir
flying-sheep May 17, 2024
1630f99
split visium tests to avoid too much downloading
flying-sheep May 17, 2024
c51da3b
remove duplication of setup
flying-sheep May 17, 2024
b8a8443
fix mention of writedir
flying-sheep May 17, 2024
e8b288c
Merge branch 'main' into doc-datasets
flying-sheep May 31, 2024
78c9e0f
add cache
flying-sheep May 31, 2024
32c7951
activate internet tests
flying-sheep May 31, 2024
a66e12f
add dependencies for internet tests
flying-sheep May 31, 2024
3c2487d
missed one
flying-sheep May 31, 2024
b1aa9b5
ugh
flying-sheep May 31, 2024
e1461c8
Merge branch 'main' into doc-datasets
flying-sheep Jun 3, 2024
03f102f
Blob example
flying-sheep Jun 3, 2024
4d2942c
moignard15, krumsiek11
flying-sheep Jun 3, 2024
ccc7d9c
more moignard
flying-sheep Jun 3, 2024
f68c2de
Merge branch 'main' into doc-datasets
flying-sheep Jun 3, 2024
ac6c614
PBMC68k
flying-sheep Jun 4, 2024
fda383e
3k
flying-sheep Jun 4, 2024
0cb201f
Merge branch 'main' into doc-datasets
flying-sheep Jun 4, 2024
0caa293
nicer `scale`
flying-sheep Jun 4, 2024
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
14 changes: 11 additions & 3 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ trigger:

variables:
python.version: '3.12'
PYTEST_ADDOPTS: '-v --color=yes --nunit-xml=test-data/test-results.xml'
PYTEST_ADDOPTS: '-v --color=yes --internet-tests --nunit-xml=test-data/test-results.xml'
TEST_EXTRA: 'test-full'
DEPENDENCIES_VERSION: "latest" # |"pre-release" | "minimum-version"
TEST_TYPE: "standard" # | "coverage"
Expand Down Expand Up @@ -44,11 +44,19 @@ jobs:
inputs:
key: '"python $(python.version)" | "$(Agent.OS)" | pyproject.toml'
restoreKeys: |
python | "$(Agent.OS)"
python
"python" | "$(Agent.OS)"
"python"
path: $(uv_cache_dir)
displayName: Cache pip packages


- task: Cache@2
inputs:
key: '"pytest"'
restoreKeys: '"pytest"'
path: $(System.DefaultWorkingDirectory)/.pytest_cache/d
displayName: Cache pytest data

- script: |
export MPLBACKEND="agg"
echo $MPLBACKEND
Expand Down
30 changes: 30 additions & 0 deletions docs/extensions/patch_myst_nb.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
"""Extension to patch https://github.com/executablebooks/MyST-NB/pull/599."""

# TODO once MyST-NB 1.1.1/1.2.0 is out, this can be removed.

from __future__ import annotations

from copy import copy
from typing import TYPE_CHECKING

from myst_nb.core.render import MditRenderMixin

if TYPE_CHECKING:
from sphinx.application import Sphinx


get_orig = MditRenderMixin.get_cell_level_config


def get_cell_level_config(
self: MditRenderMixin,
field: str,
cell_metadata: dict[str, object],
line: int | None = None,
):
rv = get_orig(self, field, cell_metadata, line)
return copy(rv)


def setup(app: Sphinx):
MditRenderMixin.get_cell_level_config = get_cell_level_config
15 changes: 15 additions & 0 deletions docs/references.bib
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,21 @@ @article{Blondel2008
pages = {P10008},
}

@article{Burczynski2006,
author = {Burczynski, Michael E. and Peterson, Ron L. and Twine, Natalie C. and Zuberek, Krystyna A. and Brodeur, Brendan J. and Casciotti, Lori and Maganti, Vasu and Reddy, Padma S. and Strahs, Andrew and Immermann, Fred and Spinelli, Walter and Schwertschlag, Ulrich and Slager, Anna M. and Cotreau, Monette M. and Dorner, Andrew J.},
title = {Molecular Classification of Crohn’s Disease and Ulcerative Colitis Patients Using Transcriptional Profiles in Peripheral Blood Mononuclear Cells},
volume = {8},
issn = {1525-1578},
url = {https://doi.org/10.2353/jmoldx.2006.050079},
doi = {10.2353/jmoldx.2006.050079},
number = {1},
journal = {The Journal of Molecular Diagnostics},
publisher = {Elsevier BV},
year = {2006},
month = {feb},
pages = {51--61},
}

@article{Butler2018,
author = {Butler, Andrew and Hoffman, Paul and Smibert, Peter and Papalexi, Efthymia and Satija, Rahul},
title = {Integrating single-cell transcriptomic data across different conditions, technologies, and species},
Expand Down
1 change: 1 addition & 0 deletions docs/release-notes/1.10.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* Fixed incorrect instructions in "testing" dev docs {pr}`2994` {smaller}`I Virshup`
* Update marsilea tutorial to use `group_` methods {pr}`3001` {smaller}`I Virshup`
* Fixed citations {pr}`3032` {smaller}`P Angerer`
* Improve dataset documentation {pr}`3060` {smaller}`P Angerer`

```{rubric} Bug fixes
```
Expand Down
7 changes: 7 additions & 0 deletions scanpy/_utils/_doctests.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,10 @@ def decorator(func: F) -> F:
return func

return decorator


def doctest_internet(func: F) -> F:
"""Mark function so doctest gets the internet mark."""

func._doctest_internet = True
return func
Loading
Loading