Skip to content

Commit 4f1a911

Browse files
add isort to sort imports (#418)
This is an automatic tool to format and sort imports. See https://github.com/PyCQA/isort for details. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent d9d6d5f commit 4f1a911

File tree

135 files changed

+369
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+369
-241
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ repos:
2121
rev: 22.12.0
2222
hooks:
2323
- id: black-jupyter
24+
- repo: https://github.com/PyCQA/isort
25+
rev: 5.12.0
26+
hooks:
27+
- id: isort
28+
files: \.py$
2429
# Python inside docs
2530
- repo: https://github.com/asottile/blacken-docs
2631
rev: 1.13.0

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# documentation root, use os.path.abspath to make it absolute, like shown here.
1414
#
1515
import os
16-
import sys
1716
import subprocess as sp
17+
import sys
1818
from datetime import date
1919

2020
sys.path.insert(0, os.path.abspath(".."))

docs/make_format.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import csv
2-
from typing import Any
32
from collections import defaultdict
3+
from typing import Any
44

55
# ensure all plugins are loaded!
66
import dpdata.plugins
7+
from dpdata.driver import Driver, Minimizer
78
from dpdata.format import Format
8-
from dpdata.driver import Driver
9-
from dpdata.driver import Minimizer
109
from dpdata.system import get_cls_name
1110

1211

dpdata/__init__.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
from . import vasp
2-
from . import lammps
3-
from . import md
4-
from .system import System
5-
from .system import LabeledSystem
6-
from .system import MultiSystems
1+
from . import lammps, md, vasp
2+
from .system import LabeledSystem, MultiSystems, System
73

84
try:
95
from ._version import version as __version__

dpdata/abacus/md.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1+
import os
2+
import re
3+
import sys
4+
import warnings
15
from ast import dump
2-
import os, sys
6+
37
import numpy as np
8+
49
from .scf import (
5-
ry2ev,
610
bohr2ang,
7-
kbar2evperang3,
811
get_block,
9-
get_geometry_in,
1012
get_cell,
1113
get_coords,
14+
get_geometry_in,
15+
kbar2evperang3,
16+
ry2ev,
1217
)
13-
import re
14-
import warnings
1518

1619
# Read in geometries from an ABACUS MD trajectory.
1720
# The atomic coordinates are read in from generated files in OUT.XXXX.

dpdata/abacus/relax.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
import os, sys
1+
import os
2+
import sys
3+
24
import numpy as np
3-
from .scf import bohr2ang, kbar2evperang3, get_geometry_in, get_cell, get_coords
5+
6+
from .scf import bohr2ang, get_cell, get_coords, get_geometry_in, kbar2evperang3
47

58
# Read in geometries from an ABACUS RELAX(CELL-RELAX) trajectory in OUT.XXXX/runnning_relax/cell-relax.log.
69

dpdata/abacus/scf.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
import os, sys
2-
import numpy as np
3-
from ..unit import EnergyConversion, PressureConversion, LengthConversion
1+
import os
42
import re
3+
import sys
4+
5+
import numpy as np
6+
7+
from ..unit import EnergyConversion, LengthConversion, PressureConversion
58

69
bohr2ang = LengthConversion("bohr", "angstrom").value()
710
ry2ev = EnergyConversion("rydberg", "eV").value()

dpdata/amber/md.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
import re
21
import os
3-
from scipy.io import netcdf
2+
import re
3+
44
import numpy as np
5+
from scipy.io import netcdf
6+
57
from dpdata.amber.mask import pick_by_amber_mask
68
from dpdata.unit import EnergyConversion
9+
710
from ..periodic_table import ELEMENTS
811

912
kcalmol2eV = EnergyConversion("kcal_mol", "eV").value()

dpdata/amber/sqm.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import numpy as np
2+
23
from dpdata.periodic_table import ELEMENTS
34
from dpdata.unit import EnergyConversion
45

dpdata/ase_calculator.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
from typing import List, Optional, TYPE_CHECKING
1+
from typing import TYPE_CHECKING, List, Optional
22

33
from ase.calculators.calculator import (
44
Calculator,
5-
all_changes,
65
PropertyNotImplementedError,
6+
all_changes,
77
)
88

99
import dpdata
10+
1011
from .driver import Driver
1112

1213
if TYPE_CHECKING:

0 commit comments

Comments
 (0)