Skip to content

Commit fd553a8

Browse files
committed
Merge branch 'master' of github.com:materialsproject/pymatgen
2 parents e6c1934 + 55b15a3 commit fd553a8

File tree

5 files changed

+32
-26
lines changed

5 files changed

+32
-26
lines changed
+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
""" Module that implements various algorithms related to interface construction and analysis """
2-
from pymatgen.analysis.interfaces.zsl import ZSLGenerator, ZSLMatch # noqa
3-
from pymatgen.analysis.interfaces.coherent_interfaces import CoherentInterfaceBuilder # noqa
4-
from pymatgen.analysis.interfaces.substrate_analyzer import SubstrateAnalyzer, SubstrateMatch # noqa
2+
from pymatgen.analysis.interfaces.coherent_interfaces import CoherentInterfaceBuilder
3+
from pymatgen.analysis.interfaces.substrate_analyzer import (
4+
SubstrateAnalyzer,
5+
SubstrateMatch,
6+
)
7+
from pymatgen.analysis.interfaces.zsl import ZSLGenerator, ZSLMatch

pymatgen/core/__init__.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
import os
1010

1111
from ruamel.yaml import YAML
12-
from .composition import Composition # noqa
13-
from .lattice import Lattice # noqa
14-
from .operations import SymmOp # noqa
15-
from .periodic_table import DummySpecies, Element, Species # noqa
16-
from .sites import PeriodicSite, Site # noqa
17-
from .structure import IMolecule, IStructure, Molecule, Structure # noqa
18-
from .units import ArrayWithUnit, FloatWithUnit, Unit # noqa
1912

13+
from .composition import Composition
14+
from .lattice import Lattice
15+
from .operations import SymmOp
16+
from .periodic_table import DummySpecies, Element, Species
17+
from .sites import PeriodicSite, Site
18+
from .structure import IMolecule, IStructure, Molecule, Structure
19+
from .units import ArrayWithUnit, FloatWithUnit, Unit
2020

2121
__author__ = "Pymatgen Development Team"
2222
__email__ = "[email protected]"

pymatgen/io/lobster/__init__.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
backwards compatibility.
1010
"""
1111

12-
from .inputs import Lobsterin # noqa
13-
from .outputs import ( # noqa
14-
Bandoverlaps, # noqa
15-
Charge, # noqa
16-
Cohpcar, # noqa
17-
Doscar, # noqa
18-
Fatband, # noqa
19-
Grosspop, # noqa
20-
Icohplist, # noqa
21-
MadelungEnergies, # noqa
22-
Lobsterout, # noqa
23-
SitePotential, # noqa
24-
Wavefunction, # noqa
25-
) # noqa
12+
from .inputs import Lobsterin
13+
from .outputs import (
14+
Bandoverlaps,
15+
Charge,
16+
Cohpcar,
17+
Doscar,
18+
Fatband,
19+
Grosspop,
20+
Icohplist,
21+
Lobsterout,
22+
MadelungEnergies,
23+
SitePotential,
24+
Wavefunction,
25+
)

pymatgen/io/vasp/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
backwards compatibility.
1010
"""
1111

12-
from .inputs import Incar, Kpoints, Poscar, Potcar, PotcarSingle, VaspInput # noqa
13-
from .outputs import ( # noqa
12+
from .inputs import Incar, Kpoints, Poscar, Potcar, PotcarSingle, VaspInput
13+
from .outputs import (
1414
BSVasprun,
1515
Chgcar,
1616
Dynmat,

setup.cfg

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ exclude = .git,__pycache__,docs_rst/conf.py,tests
2222
# max-complexity = 10
2323
extend-ignore = E741,W291,W293,E501,E231,E203
2424
max-line-length = 120
25+
per-file-ignores =
26+
# F401: imported but unused
27+
__init__.py: F401
2528

2629
[pydocstyle]
2730
ignore = D105,D2,D4

0 commit comments

Comments
 (0)