From aefc914d31169285b8c50e1a29a98bb098647633 Mon Sep 17 00:00:00 2001 From: "Lumberbot (aka Jack)" <39504233+meeseeksmachine@users.noreply.github.com> Date: Tue, 12 Mar 2024 22:34:02 +0100 Subject: [PATCH] Backport PR #1419: [pre-commit.ci] pre-commit autoupdate (#1420) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- anndata/_core/merge.py | 1 + anndata/_types.py | 1 + anndata/tests/test_annot.py | 1 + anndata/tests/test_awkward.py | 1 + anndata/tests/test_concatenate.py | 6 +++--- anndata/tests/test_dask.py | 8 +++++--- anndata/tests/test_deprecations.py | 1 + anndata/tests/test_io_conversion.py | 1 + anndata/tests/test_io_elementwise.py | 1 + anndata/tests/test_x.py | 1 + benchmarks/benchmarks/readwrite.py | 1 + 12 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 064bdc00f..86751df5a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.2.2 + rev: v0.3.2 hooks: - id: ruff types_or: [python, pyi, jupyter] diff --git a/anndata/_core/merge.py b/anndata/_core/merge.py index 48f36be9d..d326d0ac2 100644 --- a/anndata/_core/merge.py +++ b/anndata/_core/merge.py @@ -1,6 +1,7 @@ """ Code for merging/ concatenating AnnData objects. """ + from __future__ import annotations import typing diff --git a/anndata/_types.py b/anndata/_types.py index 7f57e380f..17dd014d5 100644 --- a/anndata/_types.py +++ b/anndata/_types.py @@ -1,6 +1,7 @@ """ Defines some useful types for this library. Should probably be cleaned up before thinking about exporting. """ + from __future__ import annotations from typing import Union diff --git a/anndata/tests/test_annot.py b/anndata/tests/test_annot.py index 0ea609906..7f4c2697e 100644 --- a/anndata/tests/test_annot.py +++ b/anndata/tests/test_annot.py @@ -1,4 +1,5 @@ """Test handling of values in `obs`/ `var`""" + from __future__ import annotations import numpy as np diff --git a/anndata/tests/test_awkward.py b/anndata/tests/test_awkward.py index 2e996bfc6..ac525ce95 100644 --- a/anndata/tests/test_awkward.py +++ b/anndata/tests/test_awkward.py @@ -1,4 +1,5 @@ """Tests related to awkward arrays""" + from __future__ import annotations import warnings diff --git a/anndata/tests/test_concatenate.py b/anndata/tests/test_concatenate.py index e24431436..80714d44a 100644 --- a/anndata/tests/test_concatenate.py +++ b/anndata/tests/test_concatenate.py @@ -873,9 +873,9 @@ def test_nan_merge(axis, join_type, array_type): with warnings.catch_warnings(): warnings.simplefilter("ignore", category=sparse.SparseEfficiencyWarning) for _ in range(10): - arr_nan[ - np.random.choice(arr.shape[0]), np.random.choice(arr.shape[1]) - ] = np.nan + arr_nan[np.random.choice(arr.shape[0]), np.random.choice(arr.shape[1])] = ( + np.nan + ) _data = {"X": sparse.csr_matrix(adata_shape), mapping_attr: {"arr": arr_nan}} orig1 = AnnData(**_data) diff --git a/anndata/tests/test_dask.py b/anndata/tests/test_dask.py index 56cb0f8c8..a4f92d162 100644 --- a/anndata/tests/test_dask.py +++ b/anndata/tests/test_dask.py @@ -1,6 +1,7 @@ """ For tests using dask """ + from __future__ import annotations import pandas as pd @@ -107,9 +108,10 @@ def test_dask_distributed_write(adata, tmp_path, diskfmt): pth = tmp_path / f"test_write.{diskfmt}" g = as_group(pth, mode="w") - with dd.LocalCluster( - n_workers=1, threads_per_worker=1, processes=False - ) as cluster, dd.Client(cluster): + with ( + dd.LocalCluster(n_workers=1, threads_per_worker=1, processes=False) as cluster, + dd.Client(cluster), + ): M, N = adata.X.shape adata.obsm["a"] = da.random.random((M, 10)) adata.obsm["b"] = da.random.random((M, 10)) diff --git a/anndata/tests/test_deprecations.py b/anndata/tests/test_deprecations.py index 39176e315..932d9e01d 100644 --- a/anndata/tests/test_deprecations.py +++ b/anndata/tests/test_deprecations.py @@ -3,6 +3,7 @@ This includes correct behaviour as well as throwing warnings. """ + from __future__ import annotations import warnings diff --git a/anndata/tests/test_io_conversion.py b/anndata/tests/test_io_conversion.py index 29a5d27e9..b5a8b639a 100644 --- a/anndata/tests/test_io_conversion.py +++ b/anndata/tests/test_io_conversion.py @@ -1,6 +1,7 @@ """\ This file contains tests for conversion made during io. """ + from __future__ import annotations import h5py diff --git a/anndata/tests/test_io_elementwise.py b/anndata/tests/test_io_elementwise.py index 4ed4dddab..51ca106d5 100644 --- a/anndata/tests/test_io_elementwise.py +++ b/anndata/tests/test_io_elementwise.py @@ -1,6 +1,7 @@ """ Tests that each element in an anndata is written correctly """ + from __future__ import annotations import re diff --git a/anndata/tests/test_x.py b/anndata/tests/test_x.py index 5f381c8c1..fd8e2f613 100644 --- a/anndata/tests/test_x.py +++ b/anndata/tests/test_x.py @@ -1,4 +1,5 @@ """Tests for the attribute .X""" + from __future__ import annotations import numpy as np diff --git a/benchmarks/benchmarks/readwrite.py b/benchmarks/benchmarks/readwrite.py index c273a436b..504f7fb5c 100644 --- a/benchmarks/benchmarks/readwrite.py +++ b/benchmarks/benchmarks/readwrite.py @@ -19,6 +19,7 @@ * io for backed objects * Reading dense as sparse, writing sparse as dense """ + from __future__ import annotations import sys