Skip to content
Open
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repos:

- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.15.6
rev: v0.16.0
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
if __name__ == "__main__":
try:
setup(use_scm_version={"version_scheme": "no-guess-dev"})
except: # noqa
except:
print(
"\n\nAn error occurred while building the project, "
"please ensure you have the most updated version of setuptools, "
Expand Down
31 changes: 16 additions & 15 deletions src/hdf5array/Hdf5CompressedSparseMatrixSeed.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from bisect import bisect_left
from typing import Callable, Literal, Optional, Sequence, Tuple
from collections.abc import Callable, Sequence
from typing import Literal

import numpy
from biocutils.package_utils import is_package_installed
Expand Down Expand Up @@ -33,14 +34,14 @@ class Hdf5CompressedSparseMatrixSeed:
def __init__(
self,
path: str,
group_name: Optional[str],
shape: Tuple[int, int],
group_name: str | None,
shape: tuple[int, int],
by_column: bool,
dtype: Optional[dtype] = None,
index_dtype: Optional[dtype] = None,
data_name: Optional[str] = None,
indices_name: Optional[str] = None,
indptr_name: Optional[str] = None,
dtype: dtype | None = None,
index_dtype: dtype | None = None,
data_name: str | None = None,
indices_name: str | None = None,
indptr_name: str | None = None,
):
"""
Args:
Expand Down Expand Up @@ -140,7 +141,7 @@ def dtype(self) -> dtype:
return self._dtype

@property
def shape(self) -> Tuple[int, int]:
def shape(self) -> tuple[int, int]:
"""
Returns:
Tuple containing the dimensions of this matrix.
Expand Down Expand Up @@ -172,7 +173,7 @@ def by_column(self) -> bool:
return self._by_column

@property
def group_name(self) -> Optional[str]:
def group_name(self) -> str | None:
"""
Returns:
Name of the HDF5 group containing the matrix contents, or None if
Expand Down Expand Up @@ -277,7 +278,7 @@ def _extract_array(

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

@extract_sparse_array.register
def extract_sparse_array_Hdf5CompressedSparseMatrixSeed(
x: Hdf5CompressedSparseMatrixSeed, subset: Tuple[Sequence[int], ...]
x: Hdf5CompressedSparseMatrixSeed, subset: tuple[Sequence[int], ...]
) -> SparseNdarray:
"""See :py:meth:`~delayedarray.extract_sparse_array.extract_sparse_array`."""
if x._by_column:
Expand Down Expand Up @@ -390,7 +391,7 @@ def _consecutive(r, cols, values):
class Hdf5CompressedSparseMatrix(DelayedArray):
"""Compressed sparse matrix in a HDF5 file as a ``DelayedArray``."""

def __init__(self, path: str, group_name: Optional[str], shape: Tuple[int, int], by_column: bool, **kwargs):
def __init__(self, path: str, group_name: str | None, shape: tuple[int, int], by_column: bool, **kwargs):
"""To construct a ``Hdf5CompressedSparseMatrix`` from an existing :py:class:`~Hdf5CompressedSparseMatrixSeed`,
use :py:meth:`~delayedarray.wrap.wrap` instead.

Expand All @@ -417,7 +418,7 @@ def __init__(self, path: str, group_name: Optional[str], shape: Tuple[int, int],
seed = path
else:
seed = Hdf5CompressedSparseMatrixSeed(path, group_name, shape, by_column, **kwargs)
super(Hdf5CompressedSparseMatrix, self).__init__(seed)
super().__init__(seed)

@property
def path(self) -> str:
Expand All @@ -444,7 +445,7 @@ def by_column(self) -> bool:
return self.seed.by_column

@property
def group_name(self) -> Optional[str]:
def group_name(self) -> str | None:
"""
Returns:
Name of the HDF5 group containing the matrix contents, or None if
Expand Down
10 changes: 5 additions & 5 deletions src/hdf5array/Hdf5DenseArraySeed.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Optional, Sequence, Tuple
from collections.abc import Sequence

import numpy
from delayedarray import (
Expand All @@ -24,7 +24,7 @@ def __init__(
self,
path: str,
name: str,
dtype: Optional[dtype] = None,
dtype: dtype | None = None,
native_order: bool = False,
) -> None:
"""
Expand Down Expand Up @@ -88,7 +88,7 @@ def dtype(self) -> dtype:
return self._dtype

@property
def shape(self) -> Tuple[int, ...]:
def shape(self) -> tuple[int, ...]:
"""
Returns:
Tuple containing the dimensions of this array.
Expand Down Expand Up @@ -122,7 +122,7 @@ def chunk_grid_Hdf5DenseArraySeed(x: Hdf5DenseArraySeed):


@extract_dense_array.register
def extract_dense_array_Hdf5DenseArraySeed(x: Hdf5DenseArraySeed, subset: Tuple[Sequence[int], ...]) -> numpy.ndarray:
def extract_dense_array_Hdf5DenseArraySeed(x: Hdf5DenseArraySeed, subset: tuple[Sequence[int], ...]) -> numpy.ndarray:
"""See :py:meth:`~delayedarray.extract_dense_array.extract_dense_array`."""
converted = []
num_lists = 0
Expand Down Expand Up @@ -204,7 +204,7 @@ def __init__(self, path: str, name: str, **kwargs):
seed = path
else:
seed = Hdf5DenseArraySeed(path, name, **kwargs)
super(Hdf5DenseArray, self).__init__(seed)
super().__init__(seed)

@property
def path(self) -> str:
Expand Down
2 changes: 1 addition & 1 deletion src/hdf5array/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
del version, PackageNotFoundError


from .Hdf5DenseArraySeed import Hdf5DenseArray, Hdf5DenseArraySeed
from .Hdf5CompressedSparseMatrixSeed import Hdf5CompressedSparseMatrix, Hdf5CompressedSparseMatrixSeed
from .Hdf5DenseArraySeed import Hdf5DenseArray, Hdf5DenseArraySeed
Loading