From 7c0e1bb39d4d2f067295cac074d88acb8a460079 Mon Sep 17 00:00:00 2001 From: Phil Schaf Date: Thu, 10 Sep 2026 09:48:10 +0200 Subject: [PATCH] test: fix `pre` job --- src/testing/scanpy/_pytest/__init__.py | 7 ++++++- tests/conftest.py | 7 ------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/testing/scanpy/_pytest/__init__.py b/src/testing/scanpy/_pytest/__init__.py index a12aadb9c3..e7d4ebb027 100644 --- a/src/testing/scanpy/_pytest/__init__.py +++ b/src/testing/scanpy/_pytest/__init__.py @@ -7,6 +7,8 @@ from importlib.util import find_spec from typing import TYPE_CHECKING +from packaging.version import Version + if sys.version_info < (3, 15): from types import MappingProxyType as frozendict # noqa: N813 @@ -48,6 +50,7 @@ def original_settings( from matplotlib.testing import setup import scanpy as sc + from scanpy._compat import pkg_version global _original_settings # noqa: PLW0603 if _original_settings is None: @@ -61,7 +64,9 @@ def original_settings( setup() sc.settings.preset = sc.Preset.ScanpyV1 - 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 = sc.Verbosity.hint sc.settings.autoshow = True diff --git a/tests/conftest.py b/tests/conftest.py index f60185722d..a4e38891fa 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -7,7 +7,6 @@ from textwrap import dedent from typing import TYPE_CHECKING, TypedDict, cast -import anndata as ad import pytest # just import for the IMPORTED check @@ -145,9 +144,3 @@ def plt(): def exit_stack() -> Generator[ExitStack]: with ExitStack() as stack: yield stack - - -@pytest.fixture(autouse=True) -def anndata_settings(): - ad.settings.auto_shard_zarr_v3 = True - ad.settings.zarr_write_format = 3