Skip to content

Commit c83342c

Browse files
authored
Merge pull request #2094 from glotzerlab/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2 parents 991d7b0 + ced1bb5 commit c83342c

File tree

6 files changed

+23
-19
lines changed

6 files changed

+23
-19
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ repos:
6868
hooks:
6969
- id: nbstripout
7070
- repo: https://github.com/astral-sh/ruff-pre-commit
71-
rev: 'v0.11.4'
71+
rev: 'v0.12.2'
7272
hooks:
7373
- id: ruff-format
7474
types_or: [python]
7575
- id: ruff
7676
types_or: [python]
7777
- repo: https://github.com/pre-commit/mirrors-clang-format
78-
rev: v20.1.0
78+
rev: v20.1.7
7979
hooks:
8080
- id: clang-format
8181
types_or: [c, c++, cuda, inc]

hoomd/logging.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,10 @@ def yield_names(self, user_name=None):
265265
if user_name is None:
266266
namespace = self.namespace
267267
else:
268-
namespace = self.namespace[:-1] + (user_name,)
268+
namespace = (*self.namespace[:-1], user_name)
269269
yield (*namespace, self.name)
270270
for i in count(start=1, step=1):
271-
yield namespace[:-1] + (namespace[-1] + "_" + str(i), self.name)
271+
yield (*namespace[:-1], namespace[-1] + "_" + str(i), self.name)
272272

273273
def update_cls(self, cls):
274274
"""Allow updating the class/namespace of the object.

hoomd/md/pytest/test_burst_writer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,9 @@ def test_burst_dump(sim, tmp_path, start, end):
183183
if end == -1:
184184
end = len(dumped_frames)
185185
with gsd.hoomd.open(name=filename, mode="r") as traj:
186-
assert [frame.configuration.step for frame in traj] == [0] + dumped_frames[
187-
start:end
186+
assert [frame.configuration.step for frame in traj] == [
187+
0,
188+
*dumped_frames[start:end],
188189
]
189190

190191

hoomd/pytest/test_local_snapshot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,9 @@ def check_shape(data, prop_dict, tags):
381381
if len(tags) == 0:
382382
assert data.shape == (0,)
383383
else:
384-
assert data.shape == (len(tags),) + prop_dict["shape"][1:]
384+
assert data.shape == (len(tags), *prop_dict["shape"][1:])
385385
else:
386-
assert data.shape == (len(tags),) + prop_dict["shape"][1:]
386+
assert data.shape == (len(tags), *prop_dict["shape"][1:])
387387

388388

389389
def check_getting(data, prop_dict, tags):

hoomd/pytest/test_logging.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def test_yield_names(self, dummy_namespace):
4848
else:
4949
break
5050
user_defined_namespace = next(quantity.yield_names("USER"))
51-
assert user_defined_namespace == dummy_namespace[:-1] + ("USER", name)
51+
assert user_defined_namespace == (*dummy_namespace[:-1], "USER", name)
5252

5353
def test_generate_namespace(self):
5454
assert _LoggerQuantity._generate_namespace(TestLoggerQuantity) == (
@@ -324,7 +324,8 @@ def test_add_single_quantity(self, blank_logger, log_quantity):
324324
assert log_value.attr == log_quantity.name
325325
assert log_value.category == log_quantity.category
326326
blank_logger._add_single_quantity([], log_quantity, None)
327-
namespace = log_quantity.namespace[:-1] + (
327+
namespace = (
328+
*log_quantity.namespace[:-1],
328329
log_quantity.namespace[-1] + "_1",
329330
log_quantity.name,
330331
)
@@ -403,8 +404,8 @@ def test_add_with_user_names(self, logged_obj, base_namespace):
403404
# Test adding a user specified identifier into the namespace
404405
user_name = "UserName"
405406
logger.add(logged_obj, user_name=user_name)
406-
assert base_namespace[:-1] + (user_name, "prop") in logger
407-
assert base_namespace[:-1] + (user_name, "proplist") in logger
407+
assert (*base_namespace[:-1], user_name, "prop") in logger
408+
assert (*base_namespace[:-1], user_name, "proplist") in logger
408409

409410
def test_remove(self, logged_obj, base_namespace):
410411
# Test removing all properties
@@ -451,17 +452,18 @@ def test_remove(self, logged_obj, base_namespace):
451452
assert prop_namespace in log
452453
assert list_namespace in log
453454
assert (
454-
prop_namespace[:-2] + (prop_namespace[-2] + "_1", prop_namespace[-1])
455-
not in log
456-
)
455+
*prop_namespace[:-2],
456+
prop_namespace[-2] + "_1",
457+
prop_namespace[-1],
458+
) not in log
457459

458460
def test_remove_with_user_name(self, logged_obj, base_namespace):
459461
# Test remove using a user specified namespace identifier
460462
logger = Logger()
461463
user_name = "UserName"
462464
logger.add(logged_obj, user_name=user_name)
463-
assert base_namespace[:-1] + (user_name, "prop") in logger
464-
assert base_namespace[:-1] + (user_name, "proplist") in logger
465+
assert (*base_namespace[:-1], user_name, "prop") in logger
466+
assert (*base_namespace[:-1], user_name, "proplist") in logger
465467

466468
def test_iadd(self, blank_logger, logged_obj):
467469
blank_logger.add(logged_obj)

hoomd/write/hdf5.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def _create_dataset(self, key: str, shape, dtype, chunk_size):
185185
shape,
186186
dtype=dtype,
187187
chunks=chunk_size,
188-
maxshape=(None,) + shape[1:],
188+
maxshape=(None, *shape[1:]),
189189
)
190190

191191
@_skip_fh
@@ -218,7 +218,8 @@ def _initialize_datasets(self, log_dict):
218218
dtype = value.dtype
219219
chunk_size = (
220220
max(self._MULTIFRAME_ARRAY_CHUNK_MAXIMUM // value.nbytes, 1),
221-
) + data_shape[1:]
221+
*data_shape[1:],
222+
)
222223
self._create_dataset(
223224
"/".join(("hoomd-data", *key)), data_shape, dtype, chunk_size
224225
)

0 commit comments

Comments
 (0)