Skip to content

Commit 5423efe

Browse files
Fix: ignore UP031 (#762)
1 parent 467ffbd commit 5423efe

26 files changed

+63
-61
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repos:
2121
# Python
2222
- repo: https://github.com/astral-sh/ruff-pre-commit
2323
# Ruff version.
24-
rev: v0.7.4
24+
rev: v0.8.1
2525
hooks:
2626
- id: ruff
2727
args: ["--fix"]

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# -- Project information -----------------------------------------------------
2525

2626
project = "dpdata"
27-
copyright = "2019-%d, DeepModeling " % date.today().year
27+
copyright = "2019-%d, DeepModeling " % date.today().year # noqa: UP031
2828
author = "Han Wang"
2929

3030
# The short X.Y version

dpdata/abacus/md.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def get_coords_from_dump(dumplines, natoms):
6868
else:
6969
nframes_dump = int(nlines / (total_natoms + 9))
7070
assert nframes_dump > 0, (
71-
"Number of lines in MD_dump file = %d. Number of atoms = %d. The MD_dump file is incomplete."
71+
"Number of lines in MD_dump file = %d. Number of atoms = %d. The MD_dump file is incomplete." # noqa: UP031
7272
% (nlines, total_natoms)
7373
)
7474
cells = np.zeros([nframes_dump, 3, 3])
@@ -125,7 +125,7 @@ def get_coords_from_dump(dumplines, natoms):
125125
)
126126
iframe += 1
127127
assert iframe == nframes_dump, (
128-
"iframe=%d, nframe_dump=%d. Number of frames does not match number of lines in MD_dump."
128+
"iframe=%d, nframe_dump=%d. Number of frames does not match number of lines in MD_dump." # noqa: UP031
129129
% (iframe, nframes_dump)
130130
)
131131
stresses *= kbar2evperang3
@@ -145,7 +145,7 @@ def get_energy(outlines, ndump, dump_freq):
145145
energy.append(np.nan)
146146
nenergy += 1
147147
assert ndump == len(energy), (
148-
"Number of total energies in running_md.log = %d. Number of frames in MD_dump = %d. Please check."
148+
"Number of total energies in running_md.log = %d. Number of frames in MD_dump = %d. Please check." # noqa: UP031
149149
% (len(energy), ndump)
150150
)
151151
energy = np.array(energy)
@@ -191,7 +191,7 @@ def get_frame(fname):
191191
force = np.delete(force, i - ndump, axis=0)
192192
stress = np.delete(stress, i - ndump, axis=0)
193193
energy = np.delete(energy, i - ndump, axis=0)
194-
unconv_stru += "%d " % i
194+
unconv_stru += "%d " % i # noqa: UP031
195195
ndump = len(energy)
196196
if unconv_stru != "":
197197
warnings.warn(f"Structure {unconv_stru} are unconverged and not collected!")

dpdata/abacus/relax.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def get_coords_from_log(loglines, natoms):
4747
natoms_log += int(line.split()[-1])
4848

4949
assert natoms_log > 0 and natoms_log == natoms, (
50-
"ERROR: detected atom number in log file is %d" % natoms
50+
"ERROR: detected atom number in log file is %d" % natoms # noqa: UP031
5151
)
5252

5353
energy = []
@@ -76,7 +76,7 @@ def get_coords_from_log(loglines, natoms):
7676
list(map(lambda x: float(x) * a0, loglines[i + k].split()[1:4]))
7777
)
7878
else:
79-
assert False, "Unrecongnized coordinate type, %s, line:%d" % (
79+
assert False, "Unrecongnized coordinate type, %s, line:%d" % ( # noqa: UP031
8080
loglines[i].split()[0],
8181
i,
8282
)

dpdata/data_type.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def check(self, system: System):
122122
elif isinstance(data, list):
123123
if len(shape) and shape[0] != len(data):
124124
raise DataError(
125-
"Length of %s is %d, but expected %d"
125+
"Length of %s is %d, but expected %d" # noqa: UP031
126126
% (self.name, len(data), shape[0])
127127
)
128128
else:

dpdata/deepmd/comp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def dump(folder, data, set_size=5000, comp_prec=np.float32, remove_sets=True):
119119
for ii in range(nsets):
120120
set_stt = ii * set_size
121121
set_end = (ii + 1) * set_size
122-
set_folder = os.path.join(folder, "set.%03d" % ii)
122+
set_folder = os.path.join(folder, "set.%03d" % ii) # noqa: UP031
123123
os.makedirs(set_folder)
124124
try:
125125
os.remove(os.path.join(folder, "nopbc"))
@@ -158,5 +158,5 @@ def dump(folder, data, set_size=5000, comp_prec=np.float32, remove_sets=True):
158158
for ii in range(nsets):
159159
set_stt = ii * set_size
160160
set_end = (ii + 1) * set_size
161-
set_folder = os.path.join(folder, "set.%03d" % ii)
161+
set_folder = os.path.join(folder, "set.%03d" % ii) # noqa: UP031
162162
np.save(os.path.join(set_folder, dtype.deepmd_name), ddata[set_stt:set_end])

dpdata/deepmd/hdf5.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def to_system_data(
5959
else:
6060
my_type_map = []
6161
for ii in range(ntypes):
62-
my_type_map.append("Type_%d" % ii)
62+
my_type_map.append("Type_%d" % ii) # noqa: UP031
6363
assert len(my_type_map) >= len(data["atom_numbs"])
6464
for ii in range(len(data["atom_numbs"])):
6565
data["atom_names"].append(my_type_map[ii])
@@ -217,7 +217,7 @@ def dump(
217217
for ii in range(nsets):
218218
set_stt = ii * set_size
219219
set_end = (ii + 1) * set_size
220-
set_folder = g.create_group("set.%03d" % ii)
220+
set_folder = g.create_group("set.%03d" % ii) # noqa: UP031
221221
for dt, prop in data_types.items():
222222
if dt in reshaped_data:
223223
set_folder.create_dataset(

dpdata/deepmd/raw.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def load_type(folder, type_map=None):
2727
else:
2828
my_type_map = []
2929
for ii in range(ntypes):
30-
my_type_map.append("Type_%d" % ii)
30+
my_type_map.append("Type_%d" % ii) # noqa: UP031
3131
data["atom_names"] = my_type_map
3232
data["atom_numbs"] = []
3333
for ii, _ in enumerate(data["atom_names"]):

dpdata/gaussian/gjf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ def make_gaussian_input(
186186
mult_frags.append(detect_multiplicity(np.array(symbols)[idx]))
187187
if use_fragment_guesses:
188188
multiplicity = sum(mult_frags) - frag_numb + 1 - charge % 2
189-
chargekeywords_frag = "%d %d" % (charge, multiplicity) + "".join(
190-
[" %d %d" % (charge, mult_frag) for mult_frag in mult_frags]
189+
chargekeywords_frag = "%d %d" % (charge, multiplicity) + "".join( # noqa: UP031
190+
[" %d %d" % (charge, mult_frag) for mult_frag in mult_frags] # noqa: UP031
191191
)
192192
else:
193193
multi_frags = np.array(mult_frags)
@@ -239,10 +239,10 @@ def make_gaussian_input(
239239
for ii, (symbol, coordinate) in enumerate(zip(symbols, coordinates)):
240240
if use_fragment_guesses:
241241
buff.append(
242-
"%s(Fragment=%d) %f %f %f" % (symbol, frag_index[ii] + 1, *coordinate)
242+
"%s(Fragment=%d) %f %f %f" % (symbol, frag_index[ii] + 1, *coordinate) # noqa: UP031
243243
)
244244
else:
245-
buff.append("{} {:f} {:f} {:f}".format(symbol, *coordinate))
245+
buff.append("{} {:f} {:f} {:f}".format(symbol, *coordinate)) # noqa: UP031
246246
if not sys_data.get("nopbc", False):
247247
# PBC condition
248248
cell = sys_data["cells"][0]

dpdata/lammps/dump.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def system_data(
289289
system["atom_names"] = []
290290
if type_map is None:
291291
for ii in range(len(system["atom_numbs"])):
292-
system["atom_names"].append("TYPE_%d" % ii)
292+
system["atom_names"].append("TYPE_%d" % ii) # noqa: UP031
293293
else:
294294
assert len(type_map) >= len(system["atom_numbs"])
295295
for ii in range(len(system["atom_numbs"])):

0 commit comments

Comments
 (0)