Skip to content

Commit dbcd64d

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent ad07258 commit dbcd64d

4 files changed

Lines changed: 23 additions & 22 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
if __name__ == "__main__":
1111
try:
1212
setup(use_scm_version={"version_scheme": "no-guess-dev"})
13-
except: # noqa
13+
except:
1414
print(
1515
"\n\nAn error occurred while building the project, "
1616
"please ensure you have the most updated version of setuptools, "

src/hdf5array/Hdf5CompressedSparseMatrixSeed.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from bisect import bisect_left
2-
from typing import Callable, Literal, Optional, Sequence, Tuple
2+
from collections.abc import Callable, Sequence
3+
from typing import Literal
34

45
import numpy
56
from biocutils.package_utils import is_package_installed
@@ -33,14 +34,14 @@ class Hdf5CompressedSparseMatrixSeed:
3334
def __init__(
3435
self,
3536
path: str,
36-
group_name: Optional[str],
37-
shape: Tuple[int, int],
37+
group_name: str | None,
38+
shape: tuple[int, int],
3839
by_column: bool,
39-
dtype: Optional[dtype] = None,
40-
index_dtype: Optional[dtype] = None,
41-
data_name: Optional[str] = None,
42-
indices_name: Optional[str] = None,
43-
indptr_name: Optional[str] = None,
40+
dtype: dtype | None = None,
41+
index_dtype: dtype | None = None,
42+
data_name: str | None = None,
43+
indices_name: str | None = None,
44+
indptr_name: str | None = None,
4445
):
4546
"""
4647
Args:
@@ -140,7 +141,7 @@ def dtype(self) -> dtype:
140141
return self._dtype
141142

142143
@property
143-
def shape(self) -> Tuple[int, int]:
144+
def shape(self) -> tuple[int, int]:
144145
"""
145146
Returns:
146147
Tuple containing the dimensions of this matrix.
@@ -172,7 +173,7 @@ def by_column(self) -> bool:
172173
return self._by_column
173174

174175
@property
175-
def group_name(self) -> Optional[str]:
176+
def group_name(self) -> str | None:
176177
"""
177178
Returns:
178179
Name of the HDF5 group containing the matrix contents, or None if
@@ -277,7 +278,7 @@ def _extract_array(
277278

278279
@extract_dense_array.register
279280
def extract_dense_array_Hdf5CompressedSparseMatrixSeed(
280-
x: Hdf5CompressedSparseMatrixSeed, subset: Tuple[Sequence[int], ...]
281+
x: Hdf5CompressedSparseMatrixSeed, subset: tuple[Sequence[int], ...]
281282
) -> numpy.ndarray:
282283
"""See :py:meth:`~delayedarray.extract_dense_array.extract_dense_array`."""
283284
output = zeros((len(subset[0]), len(subset[1])), dtype=x.dtype, order="F")
@@ -318,7 +319,7 @@ def _consecutive(r, cols, values):
318319

319320
@extract_sparse_array.register
320321
def extract_sparse_array_Hdf5CompressedSparseMatrixSeed(
321-
x: Hdf5CompressedSparseMatrixSeed, subset: Tuple[Sequence[int], ...]
322+
x: Hdf5CompressedSparseMatrixSeed, subset: tuple[Sequence[int], ...]
322323
) -> SparseNdarray:
323324
"""See :py:meth:`~delayedarray.extract_sparse_array.extract_sparse_array`."""
324325
if x._by_column:
@@ -390,7 +391,7 @@ def _consecutive(r, cols, values):
390391
class Hdf5CompressedSparseMatrix(DelayedArray):
391392
"""Compressed sparse matrix in a HDF5 file as a ``DelayedArray``."""
392393

393-
def __init__(self, path: str, group_name: Optional[str], shape: Tuple[int, int], by_column: bool, **kwargs):
394+
def __init__(self, path: str, group_name: str | None, shape: tuple[int, int], by_column: bool, **kwargs):
394395
"""To construct a ``Hdf5CompressedSparseMatrix`` from an existing :py:class:`~Hdf5CompressedSparseMatrixSeed`,
395396
use :py:meth:`~delayedarray.wrap.wrap` instead.
396397
@@ -417,7 +418,7 @@ def __init__(self, path: str, group_name: Optional[str], shape: Tuple[int, int],
417418
seed = path
418419
else:
419420
seed = Hdf5CompressedSparseMatrixSeed(path, group_name, shape, by_column, **kwargs)
420-
super(Hdf5CompressedSparseMatrix, self).__init__(seed)
421+
super().__init__(seed)
421422

422423
@property
423424
def path(self) -> str:
@@ -444,7 +445,7 @@ def by_column(self) -> bool:
444445
return self.seed.by_column
445446

446447
@property
447-
def group_name(self) -> Optional[str]:
448+
def group_name(self) -> str | None:
448449
"""
449450
Returns:
450451
Name of the HDF5 group containing the matrix contents, or None if

src/hdf5array/Hdf5DenseArraySeed.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Optional, Sequence, Tuple
1+
from collections.abc import Sequence
22

33
import numpy
44
from delayedarray import (
@@ -24,7 +24,7 @@ def __init__(
2424
self,
2525
path: str,
2626
name: str,
27-
dtype: Optional[dtype] = None,
27+
dtype: dtype | None = None,
2828
native_order: bool = False,
2929
) -> None:
3030
"""
@@ -88,7 +88,7 @@ def dtype(self) -> dtype:
8888
return self._dtype
8989

9090
@property
91-
def shape(self) -> Tuple[int, ...]:
91+
def shape(self) -> tuple[int, ...]:
9292
"""
9393
Returns:
9494
Tuple containing the dimensions of this array.
@@ -122,7 +122,7 @@ def chunk_grid_Hdf5DenseArraySeed(x: Hdf5DenseArraySeed):
122122

123123

124124
@extract_dense_array.register
125-
def extract_dense_array_Hdf5DenseArraySeed(x: Hdf5DenseArraySeed, subset: Tuple[Sequence[int], ...]) -> numpy.ndarray:
125+
def extract_dense_array_Hdf5DenseArraySeed(x: Hdf5DenseArraySeed, subset: tuple[Sequence[int], ...]) -> numpy.ndarray:
126126
"""See :py:meth:`~delayedarray.extract_dense_array.extract_dense_array`."""
127127
converted = []
128128
num_lists = 0
@@ -204,7 +204,7 @@ def __init__(self, path: str, name: str, **kwargs):
204204
seed = path
205205
else:
206206
seed = Hdf5DenseArraySeed(path, name, **kwargs)
207-
super(Hdf5DenseArray, self).__init__(seed)
207+
super().__init__(seed)
208208

209209
@property
210210
def path(self) -> str:

src/hdf5array/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
del version, PackageNotFoundError
1717

1818

19-
from .Hdf5DenseArraySeed import Hdf5DenseArray, Hdf5DenseArraySeed
2019
from .Hdf5CompressedSparseMatrixSeed import Hdf5CompressedSparseMatrix, Hdf5CompressedSparseMatrixSeed
20+
from .Hdf5DenseArraySeed import Hdf5DenseArray, Hdf5DenseArraySeed

0 commit comments

Comments
 (0)