Skip to content

Commit

Permalink
isort
Browse files Browse the repository at this point in the history
  • Loading branch information
loriab committed Feb 14, 2021
1 parent 88c0a3b commit 6564080
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.DEFAULT_GOAL := all
isort = isort -rc qcengine
isort = isort --float-to-top qcengine
black = black qcengine
autoflake = autoflake -ir --remove-all-unused-imports --ignore-init-module-imports --remove-unused-variables --exclude="**/tests/**" qcengine

Expand Down
3 changes: 1 addition & 2 deletions qcengine/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import sys
from typing import Any, Dict

from . import get_program # run and run-procedure; info
from . import (
__version__,
compute,
Expand All @@ -20,8 +21,6 @@
)
from .config import global_repr # info

from . import get_program # run and run-procedure; info

__all__ = ["main"]

info_choices = frozenset(["version", "programs", "procedures", "config", "all"])
Expand Down
2 changes: 1 addition & 1 deletion qcengine/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import traceback
from typing import Dict, Optional, Any
from typing import Any, Dict, Optional

from qcelemental.models import AtomicInput

Expand Down
8 changes: 4 additions & 4 deletions qcengine/procedures/nwchem_opt/harvester.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from decimal import Decimal
from typing import Tuple, List
import re
from decimal import Decimal
from typing import List, Tuple

from qcelemental.models import Molecule, AtomicResult, OptimizationInput, Provenance
from qcelemental.models import AtomicResult, Molecule, OptimizationInput, Provenance
from qcelemental.util import unnp

from qcengine.programs.nwchem.harvester import harvest_outfile_pass
from qcengine.programs.qcvar_identities_resources import build_out, build_atomicproperties
from qcengine.programs.qcvar_identities_resources import build_atomicproperties, build_out
from qcengine.programs.util import PreservingDict


Expand Down
10 changes: 5 additions & 5 deletions qcengine/programs/adcc.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"""
Calls adcc
"""
from typing import Dict, TYPE_CHECKING
from typing import TYPE_CHECKING, Dict

from qcelemental.util import safe_version, which_import
from qcelemental.models import AtomicResult, Provenance
from .qcvar_identities_resources import build_atomicproperties
from qcelemental.util import safe_version, which_import

from .model import ProgramHarness
from ..exceptions import InputError, UnknownError
from .model import ProgramHarness
from .qcvar_identities_resources import build_atomicproperties

if TYPE_CHECKING:
from qcelemental.models import AtomicInput
Expand Down Expand Up @@ -84,7 +84,7 @@ def compute(self, input_model: "AtomicInput", config: "TaskConfig") -> "AtomicRe
model = input_model.model
conv_tol = input_model.keywords.get("conv_tol", 1e-6)

need_one_of_states = {'n_spin_flip', 'n_triplets', 'n_states', 'n_singlets'}
need_one_of_states = {"n_spin_flip", "n_triplets", "n_states", "n_singlets"}
if not (need_one_of_states & set(input_model.keywords)):
input_model.keywords["n_states"] = 1

Expand Down
4 changes: 2 additions & 2 deletions qcengine/programs/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
from .adcc import AdccHarness
from .cfour import CFOURHarness
from .dftd3 import DFTD3Harness
from .gcp import GCPHarness
from .qcore import QcoreHarness, EntosHarness
from .gamess import GAMESSHarness
from .gcp import GCPHarness
from .molpro import MolproHarness
from .mopac import MopacHarness
from .mp2d import MP2DHarness
Expand All @@ -19,6 +18,7 @@
from .openmm import OpenMMHarness
from .psi4 import Psi4Harness
from .qchem import QChemHarness
from .qcore import EntosHarness, QcoreHarness
from .rdkit import RDKitHarness
from .terachem import TeraChemHarness
from .torchani import TorchANIHarness
Expand Down
2 changes: 1 addition & 1 deletion qcengine/programs/nwchem/errors.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Known errors for NWChem"""
from typing import Dict, Any
from typing import Any, Dict

from qcelemental.models import AtomicInput

Expand Down
2 changes: 1 addition & 1 deletion qcengine/programs/nwchem/harvester.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
import re
from decimal import Decimal
from typing import Tuple, Optional
from typing import Optional, Tuple

import numpy as np
import qcelemental as qcel
Expand Down
2 changes: 1 addition & 1 deletion qcengine/programs/nwchem/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
from ...exceptions import InputError
from ...util import create_mpi_invocation, execute
from ..model import ErrorCorrectionProgramHarness
from .errors import all_errors
from ..qcvar_identities_resources import build_atomicproperties, build_out
from .errors import all_errors
from .germinate import muster_modelchem
from .harvester import harvest
from .keywords import format_keywords
Expand Down
2 changes: 1 addition & 1 deletion qcengine/programs/qcore.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
The qcore QCEngine Harness
"""

from typing import Any, Dict, List, Set, TYPE_CHECKING
from typing import TYPE_CHECKING, Any, Dict, List, Set

import numpy as np
from qcelemental.models import AtomicResult, BasisSet
Expand Down
6 changes: 3 additions & 3 deletions qcengine/programs/tests/test_adcc.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""Tests for adcc functionality"""
import pytest
import numpy as np
import qcengine as qcng
import pytest
import qcelemental as qcel
from qcelemental.testing import compare_values

import qcengine as qcng
from qcengine.testing import using
from qcelemental.testing import compare_values


@pytest.fixture
Expand Down
2 changes: 1 addition & 1 deletion qcengine/programs/tests/test_dftd3_mp2d.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import copy

import pprint

import numpy as np
import pytest
import qcelemental as qcel
Expand Down
1 change: 0 additions & 1 deletion qcengine/programs/tests/test_nwchem.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import qcengine as qcng
from qcengine.testing import using


# Molecule where autoz fails
_auto_z_problem = xyz = """C 15.204188380000 -3.519180270000 -10.798726560000
C 15.097645630000 -2.650246400000 -8.505033680000
Expand Down
2 changes: 1 addition & 1 deletion qcengine/programs/tests/test_qcore.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np
import pytest
import qcelemental as qcel
import numpy as np
from qcelemental.testing import compare_recursive, compare_values

import qcengine as qcng
Expand Down
1 change: 1 addition & 0 deletions qcengine/programs/turbomole/methods.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Available methods

METHODS = {
# Dummy for HF
"hf": ["hf"],
Expand Down

0 comments on commit 6564080

Please sign in to comment.