Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# https://docs.readthedocs.io/en/stable/config-file/v2.html
version: 2
build:
os: ubuntu-24.04
os: ubuntu-26.04
tools:
python: '3.13'
python: '3.14'
jobs:
post_checkout:
# unshallow so version can be derived from tag
Expand All @@ -17,5 +17,5 @@ build:
- ( find docs/release-notes -regex '[^.]+[.][^.]+.md' | grep -q . ) && uvx hatch run towncrier build --keep || true
build:
html:
- uvx hatch run docs:build -T
- uvx --from=hatch!=1.18.0 hatch run docs:build -T
- mv docs/_build $READTHEDOCS_OUTPUT
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ def setup(app: Sphinx) -> None:
# Technical issues
("py:class", "numpy.int64"), # documented as “attribute”
("py:class", "numpy._typing._dtype_like._SupportsDType"),
("py:obj", "numpy._typing._dtype_like._SupportsDType"),
("py:class", "numpy._typing._dtype_like._DTypeDict"),
# Will probably be documented
("py:class", "scanpy.neighbors.OnFlySymMatrix"),
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ docs = [
"nbsphinx>=0.9",
"numpy>=2.4", # type aliases
"plotly",
"sam-algorithm",
# TODO: remove necessity for being able to import doc-linked classes
"scanpy[dask-ml,leiden,paga,plotting,scanpy2,scrublet]",
"scanpydoc>=0.16.1",
Expand Down
6 changes: 5 additions & 1 deletion src/scanpy/external/tl/_sam.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
from typing import Literal

from anndata import AnnData
from samalg import SAM

try:
from samalg import SAM
except ImportError:
SAM = type("SAM", (), dict(__module__="samalg"))


@doctest_needs("samalg")
Expand Down
2 changes: 1 addition & 1 deletion src/testing/scanpy/_pytest/marks.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def _generate_next_value_(
phate = auto()
phenograph = auto()
pypairs = auto()
samalg = "sam-algorithm"
samalg = "sc-sam"
scanorama = auto()
trimap = auto()
wishbone = "wishbone-dev"
Expand Down
Loading