Skip to content

Commit 4d45cb8

Browse files
fix: Sphinx 9 support (#260)
* fix: sphinx 9 support * example data * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * oops * Render notebooks * bump versions --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: flying-sheep <291575+flying-sheep@users.noreply.github.com>
1 parent c775c76 commit 4d45cb8

9 files changed

Lines changed: 272 additions & 189 deletions

.github/workflows/execute-nbs.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
- "environment.yml"
99

1010
defaults:
11-
run:
12-
shell: bash -el {0}
11+
run: # add -l to GitHub’s defaults to make conda work
12+
shell: bash -leo pipefail {0}
1313

1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -21,22 +21,22 @@ jobs:
2121
permissions:
2222
contents: write # Allow GH actions to push changes to repo
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525
with:
2626
repository: ${{ github.event.pull_request.head.repo.full_name }}
2727
ref: ${{ github.head_ref }}
2828
filter: blob:none
2929
fetch-depth: 0
3030
- name: Cache conda
31-
uses: actions/cache@v4
31+
uses: actions/cache@v5
3232
env:
3333
# Increase this value to reset cache if env file has not changed
3434
CACHE_NUMBER: 0
3535
with:
3636
path: ~/conda_pkgs_dir
3737
key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.yml') }}
3838
- name: Cache notebooks
39-
uses: actions/cache@v4
39+
uses: actions/cache@v5
4040
env:
4141
# Increase this value to reset cache if env file has not changed
4242
CACHE_NUMBER: 0
@@ -83,6 +83,6 @@ jobs:
8383
jcache notebook merge $f $f
8484
done
8585
86-
- uses: stefanzweifel/git-auto-commit-action@v5
86+
- uses: stefanzweifel/git-auto-commit-action@v7
8787
with:
8888
commit_message: Render notebooks

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
buck-out/
55

66
# Compiled files
7-
.venv/
7+
/.venv/
8+
/.pixi/*
9+
/pixi.*
810
__pycache__/
911
.ipynb_checkpoints/
1012
.*cache/

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
"sphinx_issues",
5757
"sphinxcontrib.bibtex",
5858
"sphinx_autodoc_typehints",
59-
"sphinx_tabs.tabs",
6059
"sphinx.ext.mathjax",
6160
"IPython.sphinxext.ipython_console_highlighting",
6261
"sphinxext.opengraph",

docs/notebooks/anndata_getting_started.ipynb

Lines changed: 8 additions & 9 deletions
Large diffs are not rendered by default.

docs/notebooks/basic-scrna-tutorial.ipynb

Lines changed: 87 additions & 101 deletions
Large diffs are not rendered by default.

docs/notebooks/scverse_data_backed.ipynb

Lines changed: 131 additions & 43 deletions
Large diffs are not rendered by default.

docs/notebooks/tutorial_axes_anndata_mudata.ipynb

Lines changed: 27 additions & 23 deletions
Large diffs are not rendered by default.

docs/notebooks/tutorial_concatenation_anndata_mudata.ipynb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,16 @@
119119
"name": "stderr",
120120
"output_type": "stream",
121121
"text": [
122-
"/home/runner/miniconda3/envs/tutorials/lib/python3.12/site-packages/anndata/_core/anndata.py:1798: UserWarning: Variable names are not unique. To make them unique, call `.var_names_make_unique`.\n",
123-
" utils.warn_names_duplicates(\"var\")\n",
124-
"/home/runner/miniconda3/envs/tutorials/lib/python3.12/site-packages/anndata/_core/anndata.py:1798: UserWarning: Variable names are not unique. To make them unique, call `.var_names_make_unique`.\n",
122+
"/home/runner/miniconda3/envs/tutorials/lib/python3.12/site-packages/anndata/_core/anndata.py:1813: UserWarning: Variable names are not unique. To make them unique, call `.var_names_make_unique`.\n",
125123
" utils.warn_names_duplicates(\"var\")\n",
124+
"/home/runner/miniconda3/envs/tutorials/lib/python3.12/site-packages/anndata/_core/anndata.py:1813: UserWarning: Variable names are not unique. To make them unique, call `.var_names_make_unique`.\n",
125+
" utils.warn_names_duplicates(\"var\")\n"
126+
]
127+
},
128+
{
129+
"name": "stderr",
130+
"output_type": "stream",
131+
"text": [
126132
"/home/runner/miniconda3/envs/tutorials/lib/python3.12/site-packages/mudata/_core/mudata.py:947: UserWarning: var_names are not unique. To make them unique, call `.var_names_make_unique`.\n",
127133
" warnings.warn(\n"
128134
]

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ optional-dependencies.docs = [
2323
"ipykernel",
2424
"ipython",
2525
"myst-nb>=1.1",
26-
"sphinx>=7",
26+
"sphinx>=9",
2727
"sphinx-autodoc-typehints",
2828
"sphinx-book-theme>=1.1",
2929
"sphinx-copybutton",
3030
"sphinx-issues>=5.0.1",
31-
"sphinx-tabs",
3231
"sphinxcontrib-bibtex>=1",
3332
"sphinxext-opengraph",
3433
]

0 commit comments

Comments
 (0)