From 7d945e8e013fa9acaa0f075f14b3468f01f939f7 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 27 Jul 2017 21:42:33 -0400 Subject: [PATCH] Fix first/third party import sorting Change-Id: I8e3a28d931e5c1283f44c9b47c261662b7072470 Signed-off-by: Thanh Ha --- .coafile | 2 ++ lftools/cli/__init__.py | 1 + lftools/cli/jenkins/__init__.py | 4 ++-- lftools/cli/nexus.py | 1 + lftools/nexus/cmd.py | 3 ++- lftools/openstack/cmd.py | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.coafile b/.coafile index e1128394..3b8ea51c 100644 --- a/.coafile +++ b/.coafile @@ -18,6 +18,8 @@ bears = BanditBear, PyFlakesBear, PyImportSortBear files = lftools/**/*.py +known_first_party_imports = lftools +known_third_party_imports = pytest, six pydocstyle_ignore = D203, D213, D301 max_line_length = 120 diff --git a/lftools/cli/__init__.py b/lftools/cli/__init__.py index 06238557..823bd8d4 100644 --- a/lftools/cli/__init__.py +++ b/lftools/cli/__init__.py @@ -13,6 +13,7 @@ __author__ = 'Thanh Ha' import click + from lftools.cli.deploy import deploy from lftools.cli.jenkins import jenkins_cli from lftools.cli.nexus import nexus diff --git a/lftools/cli/jenkins/__init__.py b/lftools/cli/jenkins/__init__.py index 5b62b71d..5487b41f 100644 --- a/lftools/cli/jenkins/__init__.py +++ b/lftools/cli/jenkins/__init__.py @@ -14,12 +14,12 @@ __author__ = 'Trevor Bramwell' import click import jenkins as jenkins_python # Don't confuse this with the function ... +from six.moves.urllib.error import HTTPError + from lftools.cli.jenkins.builds import builds from lftools.cli.jenkins.nodes import nodes from lftools.cli.jenkins.plugins import plugins_init -from six.moves.urllib.error import HTTPError - @click.group() @click.option('-s', '--server', type=str, required=True, envvar='JENKINS_URL') diff --git a/lftools/cli/nexus.py b/lftools/cli/nexus.py index 4ebd9cc1..d8f8f123 100644 --- a/lftools/cli/nexus.py +++ b/lftools/cli/nexus.py @@ -9,6 +9,7 @@ ############################################################################## """CLI entry point for nexus commands.""" import click + from lftools.nexus import cmd as nexuscmd diff --git a/lftools/nexus/cmd.py b/lftools/nexus/cmd.py index 6583f310..34e56d04 100644 --- a/lftools/nexus/cmd.py +++ b/lftools/nexus/cmd.py @@ -11,9 +11,10 @@ """Contains functions for various Nexus tasks.""" import sys -from lftools.nexus import Nexus import yaml +from lftools.nexus import Nexus + def reorder_staged_repos(settings_file): """Reorder staging repositories in Nexus. diff --git a/lftools/openstack/cmd.py b/lftools/openstack/cmd.py index 0c8c8acb..97fd125a 100644 --- a/lftools/openstack/cmd.py +++ b/lftools/openstack/cmd.py @@ -14,6 +14,7 @@ __author__ = 'Thanh Ha' import click + from lftools.openstack import image as os_image from lftools.openstack import server as os_server -- 2.16.6