Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pre-commit.ci] pre-commit autoupdate #174

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
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
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v5.0.0
hooks:
- id: no-commit-to-branch
name: Don't commit to master
- id: fix-encoding-pragma
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/PyCQA/isort
rev: 5.9.3
rev: 5.13.2
hooks:
- id: isort
additional_dependencies: [toml]
# excludes all the init files from sorting
exclude: ^.*\/__init__\.py$
- repo: https://github.com/psf/black
rev: 21.9b0
rev: 24.10.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
rev: 7.1.1
hooks:
- id: flake8
3 changes: 1 addition & 2 deletions nata/containers/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ class BackendType(Protocol):
name: str

@staticmethod
def is_valid_backend(location: Path) -> bool:
... # pragma: no cover
def is_valid_backend(location: Path) -> bool: ... # pragma: no cover


class HasBackends:
Expand Down
9 changes: 3 additions & 6 deletions nata/containers/grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,10 @@ class GridBackend(Protocol):
name: str
location: Path

def __init__(self, location: FileLocation) -> None:
...
def __init__(self, location: FileLocation) -> None: ...

@staticmethod
def is_valid_backend(location: FileLocation) -> bool:
...
def is_valid_backend(location: FileLocation) -> bool: ...

dataset_name: str
dataset_label: str
Expand All @@ -100,8 +98,7 @@ def is_valid_backend(location: FileLocation) -> bool:

@runtime_checkable
class GridDataReader(GridBackend, Protocol):
def get_data(self, indexing: Optional[BasicIndexing] = None) -> np.ndarray:
...
def get_data(self, indexing: Optional[BasicIndexing] = None) -> np.ndarray: ...


class GridArray(
Expand Down
13 changes: 4 additions & 9 deletions nata/containers/particle.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,10 @@ class ParticleBackend(Protocol):
name: str
location: Path

def __init__(self, location: FileLocation) -> None:
...
def __init__(self, location: FileLocation) -> None: ...

@staticmethod
def is_valid_backend(location: FileLocation) -> bool:
...
def is_valid_backend(location: FileLocation) -> bool: ...

dataset_name: str
dataset_label: str
Expand All @@ -111,8 +109,7 @@ class ParticleDataReader(ParticleBackend, Protocol):
def get_data(
self,
indexing: Optional[BasicIndexing] = None,
) -> np.ndarray:
...
) -> np.ndarray: ...


class Quantity(
Expand Down Expand Up @@ -800,9 +797,7 @@ def _decay_to_ParticleDataset(
time=self.time[index[0]],
)

def __getitem__(
self, key: Any
) -> Union[
def __getitem__(self, key: Any) -> Union[
"ParticleDataset",
"ParticleArray",
"Particle",
Expand Down
20 changes: 11 additions & 9 deletions nata/plots/figure.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,17 @@ def scatter(
s=size,
c=color if has_colors else None,
color=color if has_single_color else None,
norm=mpl_norm_from_scale(
colorscale,
(
colorrange[0] if colorrange else np.min(color),
colorrange[1] if colorrange else np.max(color),
),
)
if has_colors
else None,
norm=(
mpl_norm_from_scale(
colorscale,
(
colorrange[0] if colorrange else np.min(color),
colorrange[1] if colorrange else np.max(color),
),
)
if has_colors
else None
),
cmap=colormap,
alpha=alpha,
)
Expand Down
3 changes: 1 addition & 2 deletions nata/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ class BackendType(Protocol):
#: point to data, either to open a file or to retrieve it.
location: Optional[FileLocation]

def __init__(self, location: FileLocation) -> None:
...
def __init__(self, location: FileLocation) -> None: ...

@staticmethod
def is_valid_backend(location: FileLocation) -> bool:
Expand Down
6 changes: 3 additions & 3 deletions nata/utils/zdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -738,9 +738,9 @@ def read_track_data(self, trackInfo):
for i in range(itermap.shape[0]):
trackID = itermap[i, 0] - 1
npoints = itermap[i, 1]
(trackData[trackID])[
trackNp[trackID] : trackNp[trackID] + npoints, :
] = data[idx : idx + npoints, :]
(trackData[trackID])[trackNp[trackID] : trackNp[trackID] + npoints, :] = (
data[idx : idx + npoints, :]
)
trackNp[trackID] += npoints
idx += npoints

Expand Down
6 changes: 2 additions & 4 deletions tests/containers/core_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ class ExtendedProtocol(Protocol):
some_other_prop: Tuple[int, ...]

@staticmethod
def is_valid_backend(location: Path) -> bool:
...
def is_valid_backend(location: Path) -> bool: ...

def some_other_method(self, foo: int) -> float:
...
def some_other_method(self, foo: int) -> float: ...

return ExtendedProtocol

Expand Down
3 changes: 1 addition & 2 deletions tests/containers/grid_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ def __init__(self, location: Union[str, Path]) -> None:
raise NotImplementedError

@staticmethod
def is_valid_backend(location: Union[str, Path]) -> bool:
...
def is_valid_backend(location: Union[str, Path]) -> bool: ...

dataset_name = str()
dataset_label = str()
Expand Down