diff --git a/src/testing/scanpy/_pytest/__init__.py b/src/testing/scanpy/_pytest/__init__.py index dbaabdf77e..02b2263c7d 100644 --- a/src/testing/scanpy/_pytest/__init__.py +++ b/src/testing/scanpy/_pytest/__init__.py @@ -51,7 +51,9 @@ def original_settings( setup() if pkg_version("anndata") >= Version("0.12"): - ad.settings.zarr_write_format = 3 # default in anndata 0.13, warns otherwise + if pkg_version("anndata") < Version("0.13"): + ad.settings.zarr_write_format = 3 + ad.settings.auto_shard_zarr_v3 = True sc.settings.logfile = sys.stderr sc.settings.verbosity = "hint" sc.settings.autoshow = True diff --git a/tests/conftest.py b/tests/conftest.py index eb488f8a04..440ba69bdb 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -7,12 +7,9 @@ from textwrap import dedent from typing import TYPE_CHECKING, TypedDict, cast -import anndata as ad import pytest -from packaging.version import Version # just import for the IMPORTED check -from scanpy._compat import pkg_version if TYPE_CHECKING: # So editors understand that we’re using those fixtures import os @@ -141,10 +138,3 @@ def plt(): def exit_stack() -> Generator[ExitStack]: with ExitStack() as stack: yield stack - - -@pytest.fixture(autouse=True) -def anndata_settings(): - if pkg_version("anndata") >= Version("0.12"): - ad.settings.auto_shard_zarr_v3 = True - ad.settings.zarr_write_format = 3