From b491aa2bff2f363204e4c99a8e50e6d0d81a470d Mon Sep 17 00:00:00 2001 From: Hirotomo Moriwaki Date: Tue, 26 Feb 2019 19:34:36 +0900 Subject: [PATCH] isort --- docs/conf.py | 1 + docs/scripts/gen_descriptor_doc.py | 5 +++-- docs/scripts/gen_descriptor_list_xlsx.py | 1 - docs/scripts/load_path.py | 2 +- examples/010-single_mol-single_desc.py | 1 + examples/110-descriptor-arithmetic.py | 1 + extra/ci/bump-dev-version.py | 2 +- extra/gen_sdf_file.py | 1 - mordred/_base/descriptor.py | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 4bd0c4e1..86a933e1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,6 +20,7 @@ import os import re import sys + sys.path.insert(0, os.path.abspath('..')) diff --git a/docs/scripts/gen_descriptor_doc.py b/docs/scripts/gen_descriptor_doc.py index a4033be5..28f11fba 100644 --- a/docs/scripts/gen_descriptor_doc.py +++ b/docs/scripts/gen_descriptor_doc.py @@ -1,8 +1,9 @@ +import sys +from itertools import chain + import load_path from mordred import descriptors from mordred._base.descriptor import is_descriptor_class -from itertools import chain -import sys load_path.nop() diff --git a/docs/scripts/gen_descriptor_list_xlsx.py b/docs/scripts/gen_descriptor_list_xlsx.py index ac45db6b..ed39869c 100644 --- a/docs/scripts/gen_descriptor_list_xlsx.py +++ b/docs/scripts/gen_descriptor_list_xlsx.py @@ -1,6 +1,5 @@ from openpyxl import Workbook from openpyxl.styles import Font - from gen_default_descs import DescriptorInfo, get_all_descriptors diff --git a/docs/scripts/load_path.py b/docs/scripts/load_path.py index 96ac54a2..deb66a7b 100644 --- a/docs/scripts/load_path.py +++ b/docs/scripts/load_path.py @@ -1,5 +1,5 @@ -import sys import os +import sys def nop(): diff --git a/examples/010-single_mol-single_desc.py b/examples/010-single_mol-single_desc.py index 34cd67dd..ea0a7f0d 100644 --- a/examples/010-single_mol-single_desc.py +++ b/examples/010-single_mol-single_desc.py @@ -1,4 +1,5 @@ from rdkit import Chem + from mordred import Chi, ABCIndex benzene = Chem.MolFromSmiles('c1ccccc1') diff --git a/examples/110-descriptor-arithmetic.py b/examples/110-descriptor-arithmetic.py index 37a40a7d..7d101b49 100644 --- a/examples/110-descriptor-arithmetic.py +++ b/examples/110-descriptor-arithmetic.py @@ -1,4 +1,5 @@ from rdkit import Chem + from mordred import Chi, ABCIndex benzene = Chem.MolFromSmiles('c1ccccc1') diff --git a/extra/ci/bump-dev-version.py b/extra/ci/bump-dev-version.py index 24e656fd..70d3a86e 100644 --- a/extra/ci/bump-dev-version.py +++ b/extra/ci/bump-dev-version.py @@ -1,5 +1,5 @@ -from distutils.version import StrictVersion import sys +from distutils.version import StrictVersion def main(version): diff --git a/extra/gen_sdf_file.py b/extra/gen_sdf_file.py index e0cdf751..8ddc44f6 100644 --- a/extra/gen_sdf_file.py +++ b/extra/gen_sdf_file.py @@ -2,7 +2,6 @@ from rdkit.Chem import AllChem as Chem - BASE = os.path.join( os.path.dirname(__file__), '..', 'mordred', 'tests', 'references' diff --git a/mordred/_base/descriptor.py b/mordred/_base/descriptor.py index cf05e335..673c2134 100644 --- a/mordred/_base/descriptor.py +++ b/mordred/_base/descriptor.py @@ -3,10 +3,10 @@ from abc import ABCMeta, abstractmethod from contextlib import contextmanager from distutils.version import StrictVersion -from rdkit import Chem import six import numpy as np +from rdkit import Chem if hasattr(inspect, "getfullargspec"): def getargs(func):