Skip to content

Commit 4cd5a00

Browse files
committed
STY/ENH: Correct only the appropriate
1 parent f82aa22 commit 4cd5a00

File tree

6 files changed

+33
-28
lines changed

6 files changed

+33
-28
lines changed

qiita_core/configuration_manager.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
# The full license is in the file LICENSE, distributed with this software.
77
# -----------------------------------------------------------------------------
88

9-
from .exceptions import MissingConfigSection
10-
119
from functools import partial
1210
from os.path import join, dirname, abspath, isdir
1311
from os import environ
1412
from future import standard_library
13+
14+
from .exceptions import MissingConfigSection
15+
1516
with standard_library.hooks():
1617
from configparser import ConfigParser
1718

qiita_core/util.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
#
66
# The full license is in the file LICENSE, distributed with this software.
77
# -----------------------------------------------------------------------------
8+
from smtplib import SMTP, SMTP_SSL, SMTPException
9+
from future import standard_library
10+
811
from qiita_core.qiita_settings import qiita_config
912
from qiita_db.sql_connection import SQLConnectionHandler
1013
from qiita_db.environment_manager import reset_test_database
1114

12-
from smtplib import SMTP, SMTP_SSL, SMTPException
13-
from future import standard_library
1415
with standard_library.hooks():
1516
from email.mime.multipart import MIMEMultipart
1617
from email.mime.text import MIMEText

qiita_db/commands.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
# The full license is in the file LICENSE, distributed with this software.
77
# -----------------------------------------------------------------------------
88

9+
from dateutil.parser import parse
10+
from os import listdir, remove
11+
from os.path import join, exists
12+
from functools import partial
13+
from future import standard_library
14+
from future.utils import viewitems
15+
from collections import defaultdict
16+
from shutil import move
17+
918
from .study import Study, StudyPerson
1019
from .user import User
1120
from .util import (get_filetypes, get_filepath_types, compute_checksum,
@@ -17,14 +26,6 @@
1726
ProcessedSortmernaParams)
1827
from .sql_connection import SQLConnectionHandler
1928

20-
from dateutil.parser import parse
21-
from os import listdir, remove
22-
from os.path import join, exists
23-
from functools import partial
24-
from future import standard_library
25-
from future.utils import viewitems
26-
from collections import defaultdict
27-
from shutil import move
2829
with standard_library.hooks():
2930
from configparser import ConfigParser
3031

qiita_db/environment_manager.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
# The full license is in the file LICENSE, distributed with this software.
77
# -----------------------------------------------------------------------------
88

9-
from qiita_core.exceptions import QiitaEnvironmentError
10-
from qiita_core.qiita_settings import qiita_config
11-
from .sql_connection import SQLConnectionHandler
12-
from .reference import Reference
13-
from natsort import natsorted
14-
159
from qiita_db.ontology import Ontology
1610
from qiita_db.util import convert_to_id
1711
from os.path import abspath, dirname, join, exists, basename, splitext
@@ -22,6 +16,13 @@
2216

2317
from future import standard_library
2418
from future.utils import viewitems
19+
20+
from qiita_core.exceptions import QiitaEnvironmentError
21+
from qiita_core.qiita_settings import qiita_config
22+
from .sql_connection import SQLConnectionHandler
23+
from .reference import Reference
24+
from natsort import natsorted
25+
2526
with standard_library.hooks():
2627
from urllib.request import urlretrieve
2728

qiita_db/test/test_commands.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
# The full license is in the file LICENSE, distributed with this software.
77
# -----------------------------------------------------------------------------
88

9+
from os import remove, close, mkdir
10+
from os.path import exists, join, basename
11+
from tempfile import mkstemp, mkdtemp
12+
from shutil import rmtree
13+
from unittest import TestCase, main
14+
from future.utils.six import StringIO
15+
from future import standard_library
16+
from functools import partial
17+
918
from qiita_db.commands import (load_study_from_cmd, load_raw_data_cmd,
1019
load_sample_template_from_cmd,
1120
load_prep_template_from_cmd,
@@ -22,14 +31,6 @@
2231
from qiita_core.util import qiita_test_checker
2332
from qiita_ware.processing_pipeline import generate_demux_file
2433

25-
from os import remove, close, mkdir
26-
from os.path import exists, join, basename
27-
from tempfile import mkstemp, mkdtemp
28-
from shutil import rmtree
29-
from unittest import TestCase, main
30-
from future.utils.six import StringIO
31-
from future import standard_library
32-
from functools import partial
3334
with standard_library.hooks():
3435
import configparser
3536

qiita_ware/wrapper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
from __future__ import division
22

3-
from qiita_db.job import Job
4-
53
from shutil import rmtree
64
from os import remove
75
from sys import stderr
@@ -10,6 +8,8 @@
108
import networkx as nx
119
from moi.job import system_call, submit, ctxs, ctx_default
1210

11+
from qiita_db.job import Job
12+
1313

1414
def system_call_from_job(job_id, **kwargs):
1515
"""Executes a system call described by a Job

0 commit comments

Comments
 (0)