Skip to content

Commit c06b798

Browse files
committed
Linting fix
1 parent 329e125 commit c06b798

File tree

6 files changed

+37
-44
lines changed

6 files changed

+37
-44
lines changed

src/nomad_simulation_parsers/parsers/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ def load(self):
2626
f'Could not load parser class {self.parser_class_name}', exc_info=e
2727
)
2828

29+
2930
class Wannier90ParserEntryPoint(EntryPoint):
3031
equal_cell_positions_tolerance: float = Field(
3132
1e-2,
32-
description='Tolerance (in angstroms) for the cell positions to be considered equal.',
33+
description='Tolerance (in angstroms) for the cell positions to be considered'
34+
'equal.',
3335
)
3436

3537

@@ -94,4 +96,4 @@ class Wannier90ParserEntryPoint(EntryPoint):
9496
code_name='Wannier90',
9597
code_homepage='http://www.wannier.org/',
9698
code_category='Atomistic code',
97-
)
99+
)

src/nomad_simulation_parsers/parsers/exciting/parser.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import os
22
from importlib import reload
33
from typing import Any
4-
from importlib import reload
54

65
import numpy as np
76
from nomad.datamodel.datamodel import (
@@ -20,7 +19,6 @@
2019
from structlog.stdlib import (
2120
BoundLogger,
2221
)
23-
from nomad_simulation_parsers.schema_packages import exciting
2422

2523
from nomad_simulation_parsers.parsers.utils.general import (
2624
remove_mapping_annotations,

src/nomad_simulation_parsers/parsers/vasp/xml_parser.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
from nomad.utils import get_logger
1111
from nomad_simulations.schema_packages.general import Simulation
1212

13-
from nomad_simulation_parsers.parsers.utils.general import remove_mapping_annotations
14-
from nomad_simulation_parsers.schema_packages import vasp
15-
1613
LOGGER = get_logger(__name__)
1714

1815

src/nomad_simulation_parsers/parsers/wannier90/file_parsers.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from nomad.parsing.file_parser.text_parser import Quantity, TextParser
44

5-
65
RE_N = r'[\n\r]'
76

87

@@ -87,17 +86,16 @@ def init_quantities(self):
8786

8887
self._quantities = [
8988
# Program quantities
90-
Quantity(
91-
'version', r'\s*\|\s*Release\:\s*([\d\.]+)\s*', repeats=False
92-
),
89+
Quantity('version', r'\s*\|\s*Release\:\s*([\d\.]+)\s*', repeats=False),
9390
# System quantities
9491
Quantity('lattice_vectors', r'\s*a_\d\s*([\d\-\s\.]+)', repeats=True),
9592
Quantity(
9693
'reciprocal_lattice_vectors', r'\s*b_\d\s*([\d\-\s\.]+)', repeats=True
9794
),
9895
Quantity(
9996
'structure',
100-
rf'(\s*Fractional Coordinate[\s\S]+?)(?:{RE_N}\s*(PROJECTIONS|K-POINT GRID))',
97+
rf'(\s*Fractional Coordinate[\s\S]+?)(?:{RE_N}\s*'
98+
rf'(PROJECTIONS|K-POINT GRID))',
10199
repeats=False,
102100
sub_parser=TextParser(quantities=structure_quantities),
103101
),
@@ -134,7 +132,8 @@ def init_quantities(self):
134132
),
135133
Quantity(
136134
'energy_windows',
137-
r'(\|\s*Energy\s*Windows\s*\|[\s\S]+?)(?:Number of target bands to extract:)',
135+
r'(\|\s*Energy\s*Windows\s*\|[\s\S]+?)'
136+
r'(?:Number of target bands to extract:)',
138137
repeats=False,
139138
sub_parser=TextParser(quantities=disentangle_quantities),
140139
),
@@ -155,4 +154,3 @@ def init_quantities(self):
155154
repeats=True,
156155
),
157156
]
158-

src/nomad_simulation_parsers/parsers/wannier90/parser.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
from .file_parsers import HrParser, WInParser, WOutParser
2424

25-
2625
configuration = config.get_plugin_entry_point(
2726
'nomad_simulation_parsers.parsers:wannier90_parser_entry_point'
2827
)
@@ -368,7 +367,9 @@ def is_mainfile(
368367
"""
369368
Returns DFT file if present.
370369
"""
371-
is_mainfile = super().is_mainfile(filename, mime, buffer, decoded_buffer, compression)
370+
is_mainfile = super().is_mainfile(
371+
filename, mime, buffer, decoded_buffer, compression
372+
)
372373
if is_mainfile:
373374
basedir = os.path.dirname(filename)
374375
basename = os.path.basename(filename)

src/nomad_simulation_parsers/schema_packages/wannier90.py

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from nomad.metainfo import SchemaPackage
21
from nomad.datamodel.metainfo.annotations import Mapper
2+
from nomad.metainfo import SchemaPackage
3+
from nomad.parsing.file_parser.mapping_parser import MAPPING_ANNOTATION_KEY
34
from nomad_simulations.schema_packages import (
45
atoms_state,
56
general,
@@ -10,8 +11,6 @@
1011
properties,
1112
variables,
1213
)
13-
from nomad.parsing.file_parser.mapping_parser import MAPPING_ANNOTATION_KEY
14-
1514

1615
m_package = SchemaPackage()
1716

@@ -45,10 +44,7 @@ class AtomsState(model_system.AtomsState):
4544
class AtomicCell(model_system.AtomicCell):
4645
model_system.AtomicCell.atoms_state.m_annotations.setdefault(
4746
MAPPING_ANNOTATION_KEY, {}
48-
).update(dict(
49-
wout=Mapper(mapper='.labels'),
50-
win=Mapper(mapper='.@')
51-
))
47+
).update(dict(wout=Mapper(mapper='.labels'), win=Mapper(mapper='.@')))
5248

5349
model_system.AtomicCell.positions.m_annotations.setdefault(
5450
MAPPING_ANNOTATION_KEY, {}
@@ -217,11 +213,13 @@ class HoppingMatrix(properties.HoppingMatrix):
217213
).update(dict(whr=Mapper(mapper='.degeneracy_factors')))
218214

219215
# TODO shape mismatch
220-
# properties.HoppingMatrix.value.m_annotations.setdefault(MAPPING_ANNOTATION_KEY, {}).update(dict(whr=Mapper(mapper='.hoppings', unit='eV')))
216+
# properties.HoppingMatrix.value.m_annotations.setdefault(
217+
# MAPPING_ANNOTATION_KEY, {}
218+
# ).update(dict(whr=Mapper(mapper='.hoppings', unit='eV')))
221219

222-
variables.WignerSeitz.m_def.m_annotations.setdefault(MAPPING_ANNOTATION_KEY, {}).update(
223-
dict(whr=Mapper(mapper='.@'))
224-
)
220+
variables.WignerSeitz.m_def.m_annotations.setdefault(
221+
MAPPING_ANNOTATION_KEY, {}
222+
).update(dict(whr=Mapper(mapper='.@')))
225223

226224

227225
class CrystalFieldSplitting(properties.CrystalFieldSplitting):
@@ -235,9 +233,9 @@ class CrystalFieldSplitting(properties.CrystalFieldSplitting):
235233

236234

237235
class Energy2(variables.Energy2):
238-
variables.Energy2.points.m_annotations.setdefault(MAPPING_ANNOTATION_KEY, {}).update(
239-
dict(dos=Mapper(mapper='.energies', unit='eV'))
240-
)
236+
variables.Energy2.points.m_annotations.setdefault(
237+
MAPPING_ANNOTATION_KEY, {}
238+
).update(dict(dos=Mapper(mapper='.energies', unit='eV')))
241239

242240

243241
class ElectronicDensityOfStates(properties.ElectronicDensityOfStates):
@@ -253,10 +251,7 @@ class ElectronicDensityOfStates(properties.ElectronicDensityOfStates):
253251
class Outputs(outputs.Outputs):
254252
outputs.Outputs.electronic_band_structures.m_annotations.setdefault(
255253
MAPPING_ANNOTATION_KEY, {}
256-
).update(dict(
257-
wout=Mapper(mapper='.@'),
258-
band=Mapper(mapper='.@')
259-
))
254+
).update(dict(wout=Mapper(mapper='.@'), band=Mapper(mapper='.@')))
260255

261256
outputs.Outputs.hopping_matrices.m_annotations.setdefault(
262257
MAPPING_ANNOTATION_KEY, {}
@@ -272,9 +267,9 @@ class Outputs(outputs.Outputs):
272267

273268

274269
class Simulation(general.Simulation):
275-
general.Simulation.program.m_annotations.setdefault(MAPPING_ANNOTATION_KEY, {}).update(
276-
dict(wout=Mapper(mapper='.@'))
277-
)
270+
general.Simulation.program.m_annotations.setdefault(
271+
MAPPING_ANNOTATION_KEY, {}
272+
).update(dict(wout=Mapper(mapper='.@')))
278273

279274
# general.Simulation.model_system.m_annotations.setdefault(
280275
# MAPPING_ANNOTATION_KEY, {}
@@ -283,16 +278,18 @@ class Simulation(general.Simulation):
283278
# wout=Mapper(mapper='.structure')
284279
# ))
285280

286-
model_method.Wannier.m_def.m_annotations.setdefault(MAPPING_ANNOTATION_KEY, {}).update(
287-
dict(wout=Mapper(mapper='.@'))
288-
)
281+
model_method.Wannier.m_def.m_annotations.setdefault(
282+
MAPPING_ANNOTATION_KEY, {}
283+
).update(dict(wout=Mapper(mapper='.@')))
289284

290-
general.Simulation.outputs.m_annotations.setdefault(MAPPING_ANNOTATION_KEY, {}).update(
285+
general.Simulation.outputs.m_annotations.setdefault(
286+
MAPPING_ANNOTATION_KEY, {}
287+
).update(
291288
dict(
292289
wout=Mapper(mapper='.@'),
293290
band=Mapper(mapper='.@'),
294291
whr=Mapper(mapper='.@'),
295-
dos=Mapper(mapper='.@')
292+
dos=Mapper(mapper='.@'),
296293
)
297294
)
298295

@@ -303,12 +300,12 @@ class Simulation(general.Simulation):
303300
wout=Mapper(mapper='@'),
304301
band=Mapper(mapper='@'),
305302
whr=Mapper(mapper='@'),
306-
dos=Mapper(mapper='@')
303+
dos=Mapper(mapper='@'),
307304
)
308305
)
309306

310307

311308
try:
312309
m_package.__init_metainfo__()
313310
except Exception:
314-
pass
311+
pass

0 commit comments

Comments
 (0)