Chore: Add isort to Python linters

ISort is an automatic import sorter for Python. More details at
the ISort GitHub page (https://github.com/PyCQA/isort).

Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: I2eaff523fab0966ea7196037669a1c603c68cd3e

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 28afee8..3eb3a30 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,16 +1,29 @@
 ---
 repos:
+  ###########
+  # General #
+  ###########
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.0.1
     hooks:
       - id: trailing-whitespace
 
+  - repo: https://github.com/jorisroovers/gitlint
+    rev: v0.15.1
+    hooks:
+      - id: gitlint
+
+  ##########
+  # Python #
+  ##########
+
   - repo: https://github.com/ambv/black
-    rev: 21.6b0
+    rev: 21.7b0
     hooks:
     - id: black
 
-  - repo: https://github.com/jorisroovers/gitlint
-    rev: v0.15.1
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.9.3
     hooks:
-      - id: gitlint
+      - id: isort

diff --git a/docs/conf.py b/docs/conf.py
index 7e72d95..2ce6e65 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,13 +19,13 @@
 #
 import os
 import sys
+
 import sphinx_bootstrap_theme
 
 sys.path.insert(0, os.path.abspath(".."))
 
-from pbr.version import VersionInfo
-
 from docs_conf.conf import *
+from pbr.version import VersionInfo
 
 version = str(VersionInfo("lftools"))
 release = str(VersionInfo("lftools"))

diff --git a/lftools/api/endpoints/gerrit.py b/lftools/api/endpoints/gerrit.py
index e728d3a..d33d245 100644 (file)
--- a/lftools/api/endpoints/gerrit.py
+++ b/lftools/api/endpoints/gerrit.py
@@ -16,8 +16,8 @@ import os
 import time
 import urllib
 
-from lftools import config
 import lftools.api.client as client
+from lftools import config
 
 log = logging.getLogger(__name__)
 

diff --git a/lftools/api/endpoints/nexus2.py b/lftools/api/endpoints/nexus2.py
index 0011b5c..ab63d64 100644 (file)
--- a/lftools/api/endpoints/nexus2.py
+++ b/lftools/api/endpoints/nexus2.py
@@ -15,8 +15,8 @@ __author__ = "DW Talton"
 import json
 import logging
 
-from lftools import config
 import lftools.api.client as client
+from lftools import config
 
 log = logging.getLogger(__name__)
 

diff --git a/lftools/api/endpoints/nexus3.py b/lftools/api/endpoints/nexus3.py
index ac28582..70452d7 100644 (file)
--- a/lftools/api/endpoints/nexus3.py
+++ b/lftools/api/endpoints/nexus3.py
@@ -15,9 +15,8 @@ __author__ = "DW Talton"
 import json
 import logging
 
-from lftools import config
-from lftools import helpers
 import lftools.api.client as client
+from lftools import config, helpers
 
 log = logging.getLogger(__name__)
 

diff --git a/lftools/api/endpoints/readthedocs.py b/lftools/api/endpoints/readthedocs.py
index 00a852c..19e1129 100644 (file)
--- a/lftools/api/endpoints/readthedocs.py
+++ b/lftools/api/endpoints/readthedocs.py
@@ -14,8 +14,8 @@ __author__ = "DW Talton"
 
 import json
 
-from lftools import config
 import lftools.api.client as client
+from lftools import config
 
 
 class ReadTheDocs(client.RestApi):

diff --git a/lftools/cli/__init__.py b/lftools/cli/__init__.py
index 8422bb0..26cc15a 100644 (file)
--- a/lftools/cli/__init__.py
+++ b/lftools/cli/__init__.py
@@ -27,9 +27,9 @@ from lftools.cli.infofile import infofile
 from lftools.cli.jenkins import jenkins_cli
 from lftools.cli.lfidapi import lfidapi
 from lftools.cli.license import license
+from lftools.cli.nexus import nexus
 from lftools.cli.nexus2 import nexus_two
 from lftools.cli.nexus3 import nexus_three
-from lftools.cli.nexus import nexus
 from lftools.cli.rtd import rtd
 from lftools.cli.schema import schema
 from lftools.cli.sign import sign

diff --git a/lftools/cli/github_cli.py b/lftools/cli/github_cli.py
index 593e29b..b5c5dd2 100644 (file)
--- a/lftools/cli/github_cli.py
+++ b/lftools/cli/github_cli.py
@@ -14,13 +14,10 @@ from __future__ import print_function
 import sys
 
 import click
-from github import Github
-from github import GithubException
+from github import Github, GithubException
 
 from lftools import config
-from lftools.github_helper import helper_list
-from lftools.github_helper import helper_user_github
-from lftools.github_helper import prvotes
+from lftools.github_helper import helper_list, helper_user_github, prvotes
 
 
 @click.group()

diff --git a/lftools/cli/infofile.py b/lftools/cli/infofile.py
index 6b7c917..446d2e5 100644 (file)
--- a/lftools/cli/infofile.py
+++ b/lftools/cli/infofile.py
@@ -16,10 +16,9 @@ import re
 import sys
 
 import click
-from pygerrit2 import GerritRestAPI
-from pygerrit2 import HTTPBasicAuth
 import ruamel.yaml
 import yaml
+from pygerrit2 import GerritRestAPI, HTTPBasicAuth
 
 from lftools import config
 from lftools.github_helper import prvotes

diff --git a/lftools/cli/ldap_cli.py b/lftools/cli/ldap_cli.py
index 4dd0683..9e82153 100644 (file)
--- a/lftools/cli/ldap_cli.py
+++ b/lftools/cli/ldap_cli.py
@@ -20,7 +20,6 @@ import subprocess
 import sys
 
 import click
-
 import ldap
 
 

diff --git a/lftools/cli/lfidapi.py b/lftools/cli/lfidapi.py
index 8030403..fb3e848 100755 (executable)
--- a/lftools/cli/lfidapi.py
+++ b/lftools/cli/lfidapi.py
@@ -13,11 +13,13 @@ import logging
 
 import click
 
-from lftools.lfidapi import helper_create_group
-from lftools.lfidapi import helper_invite
-from lftools.lfidapi import helper_match_ldap_to_info
-from lftools.lfidapi import helper_search_members
-from lftools.lfidapi import helper_user
+from lftools.lfidapi import (
+    helper_create_group,
+    helper_invite,
+    helper_match_ldap_to_info,
+    helper_search_members,
+    helper_user,
+)
 
 log = logging.getLogger(__name__)
 

diff --git a/lftools/cli/license.py b/lftools/cli/license.py
index 916b27c..04ea33f 100644 (file)
--- a/lftools/cli/license.py
+++ b/lftools/cli/license.py
@@ -16,8 +16,7 @@ import sys
 
 import click
 
-from lftools.license import check_license
-from lftools.license import check_license_directory
+from lftools.license import check_license, check_license_directory
 
 
 @click.group()

diff --git a/lftools/cli/nexus.py b/lftools/cli/nexus.py
index e425e08..4702ec4 100644 (file)
--- a/lftools/cli/nexus.py
+++ b/lftools/cli/nexus.py
@@ -12,8 +12,8 @@ from os import environ
 
 import click
 
-from lftools.nexus import cmd as nexuscmd
 import lftools.nexus.release_docker_hub as rdh
+from lftools.nexus import cmd as nexuscmd
 
 NEXUS_URL_ENV = "NEXUS_URL"
 

diff --git a/lftools/cli/utils.py b/lftools/cli/utils.py
index db81ff0..b1af667 100644 (file)
--- a/lftools/cli/utils.py
+++ b/lftools/cli/utils.py
@@ -10,9 +10,10 @@
 
 """lftools utils command."""
 
-import click
 import logging
 
+import click
+
 from lftools import helpers
 
 log = logging.getLogger(__name__)

diff --git a/lftools/deploy.py b/lftools/deploy.py
index a2875c2..cfbfe81 100755 (executable)
--- a/lftools/deploy.py
+++ b/lftools/deploy.py
@@ -27,10 +27,10 @@ import tempfile
 import zipfile
 
 import boto3
-from botocore.exceptions import ClientError
-from defusedxml.minidom import parseString
 import requests
 import six
+from botocore.exceptions import ClientError
+from defusedxml.minidom import parseString
 
 log = logging.getLogger(__name__)
 logging.getLogger("botocore").setLevel(logging.CRITICAL)

diff --git a/lftools/github_helper.py b/lftools/github_helper.py
index b9a70b9..524e688 100755 (executable)
--- a/lftools/github_helper.py
+++ b/lftools/github_helper.py
@@ -14,8 +14,7 @@ from __future__ import print_function
 import logging
 import sys
 
-from github import Github
-from github import GithubException
+from github import Github, GithubException
 
 from lftools import config
 

diff --git a/lftools/ldap_cli.py b/lftools/ldap_cli.py
index d6285b5..e634488 100644 (file)
--- a/lftools/ldap_cli.py
+++ b/lftools/ldap_cli.py
@@ -11,8 +11,7 @@
 
 from __future__ import print_function
 
-from subprocess import check_output
-from subprocess import STDOUT
+from subprocess import STDOUT, check_output
 
 
 def helper_yaml4info(group):

diff --git a/lftools/lfidapi.py b/lftools/lfidapi.py
index c8d0ca7..1de0073 100755 (executable)
--- a/lftools/lfidapi.py
+++ b/lftools/lfidapi.py
@@ -13,13 +13,12 @@ import json
 import logging
 import sys
 
-from email_validator import validate_email
 import requests
-from six.moves import urllib
 import yaml
+from email_validator import validate_email
+from six.moves import urllib
 
-from lftools.github_helper import helper_list
-from lftools.github_helper import helper_user_github
+from lftools.github_helper import helper_list, helper_user_github
 from lftools.oauth2_helper import oauth_helper
 
 log = logging.getLogger(__name__)

diff --git a/lftools/nexus/cmd.py b/lftools/nexus/cmd.py
index 83cb222..a3264e4 100644 (file)
--- a/lftools/nexus/cmd.py
+++ b/lftools/nexus/cmd.py
@@ -14,17 +14,16 @@ import csv
 import logging
 import re
 import sys
-from time import sleep
 import xml.etree.ElementTree as et  # nosec
+from time import sleep
 
 import bs4
 import requests
-from six.moves import configparser
 import yaml
+from six.moves import configparser
 
 from lftools import config
-from lftools.nexus import Nexus
-from lftools.nexus import util
+from lftools.nexus import Nexus, util
 
 log = logging.getLogger(__name__)
 

diff --git a/lftools/nexus/release_docker_hub.py b/lftools/nexus/release_docker_hub.py
index 37d7582..00dfb0b 100644 (file)
--- a/lftools/nexus/release_docker_hub.py
+++ b/lftools/nexus/release_docker_hub.py
@@ -42,10 +42,10 @@ from __future__ import print_function
 
 import logging
 import multiprocessing
-from multiprocessing.dummy import Pool as ThreadPool
+import os
 import re
 import socket
-import os
+from multiprocessing.dummy import Pool as ThreadPool
 
 import docker
 import requests

diff --git a/lftools/openstack/cmd.py b/lftools/openstack/cmd.py
index 1e683f9..659222b 100644 (file)
--- a/lftools/openstack/cmd.py
+++ b/lftools/openstack/cmd.py
@@ -13,9 +13,10 @@
 __author__ = "Thanh Ha"
 
 
-import click
-import subprocess
 import re
+import subprocess
+
+import click
 
 from lftools.openstack import image as os_image
 from lftools.openstack import object as os_object

diff --git a/lftools/openstack/image.py b/lftools/openstack/image.py
index 5cc1a9c..8e0220d 100644 (file)
--- a/lftools/openstack/image.py
+++ b/lftools/openstack/image.py
@@ -12,13 +12,12 @@
 
 __author__ = "Thanh Ha"
 
-from datetime import datetime
-from datetime import timedelta
 import logging
 import re
 import subprocess
 import sys
 import tempfile
+from datetime import datetime, timedelta
 
 import openstack
 import openstack.config

diff --git a/lftools/openstack/server.py b/lftools/openstack/server.py
index 759b2cc..b0bdda3 100644 (file)
--- a/lftools/openstack/server.py
+++ b/lftools/openstack/server.py
@@ -12,9 +12,8 @@
 
 __author__ = "Anil Belur"
 
-from datetime import datetime
-from datetime import timedelta
 import sys
+from datetime import datetime, timedelta
 
 import shade
 

diff --git a/lftools/openstack/stack.py b/lftools/openstack/stack.py
index 9ab0261..f77fefe 100644 (file)
--- a/lftools/openstack/stack.py
+++ b/lftools/openstack/stack.py
@@ -12,17 +12,17 @@
 
 __author__ = "Thanh Ha"
 
-from datetime import datetime
 import json
 import logging
 import sys
 import time
 import urllib.request
+from datetime import datetime
 
+import openstack
 import shade
 
 from lftools.jenkins import Jenkins
-import openstack
 
 log = logging.getLogger(__name__)
 

diff --git a/lftools/openstack/volume.py b/lftools/openstack/volume.py
index 6c43d32..e612b48 100644 (file)
--- a/lftools/openstack/volume.py
+++ b/lftools/openstack/volume.py
@@ -12,9 +12,8 @@
 
 __author__ = "Thanh Ha"
 
-from datetime import datetime
-from datetime import timedelta
 import sys
+from datetime import datetime, timedelta
 
 import shade
 

diff --git a/lftools/shell/dco.py b/lftools/shell/dco.py
index 1a1a06c..ca02622 100644 (file)
--- a/lftools/shell/dco.py
+++ b/lftools/shell/dco.py
@@ -14,10 +14,9 @@ __author__ = "DW Talton"
 
 import logging
 import os
-from os import chdir
-from os import getcwd
 import re
 import subprocess
+from os import chdir, getcwd
 
 log = logging.getLogger(__name__)
 

diff --git a/pyproject.toml b/pyproject.toml
index 2785c33..ac6241e 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,3 +7,6 @@ exclude = '''
   | \.venv
 )/
 '''
+
+[tool.isort]
+profile = "black"

diff --git a/setup.py b/setup.py
index 582a2dc..486ea9d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -10,9 +10,7 @@
 ##############################################################################
 """Setup.py."""
 
-from setuptools import find_packages
-from setuptools import setup
-
+from setuptools import find_packages, setup
 
 with open("requirements.txt") as f:
     install_reqs = f.read().splitlines()

diff --git a/tests/test_deploy.py b/tests/test_deploy.py
index 5b98824..299a794 100644 (file)
--- a/tests/test_deploy.py
+++ b/tests/test_deploy.py
@@ -15,9 +15,8 @@ import sys
 import pytest
 import requests
 
-from lftools import cli
 import lftools.deploy as deploy_sys
-
+from lftools import cli
 
 FIXTURE_DIR = os.path.join(
     os.path.dirname(os.path.realpath(__file__)),

diff --git a/tests/test_nexus.py b/tests/test_nexus.py
index 7c3930c..5887eda 100644 (file)
--- a/tests/test_nexus.py
+++ b/tests/test_nexus.py
@@ -14,9 +14,7 @@ import re
 
 import pytest
 
-from lftools.nexus import cmd
-from lftools.nexus import util
-
+from lftools.nexus import cmd, util
 
 FIXTURE_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "fixtures")
 

diff --git a/tests/test_release_docker_hub.py b/tests/test_release_docker_hub.py
index 0b7bb60..a7d6832 100644 (file)
--- a/tests/test_release_docker_hub.py
+++ b/tests/test_release_docker_hub.py
@@ -13,11 +13,11 @@ import os
 import sys
 
 import pytest
-import responses
 import requests
+import responses
 
-from lftools import cli
 import lftools.nexus.release_docker_hub as rdh
+from lftools import cli
 
 FIXTURE_DIR = os.path.join(
     os.path.dirname(os.path.realpath(__file__)),

diff --git a/tests/test_rtd.py b/tests/test_rtd.py
index 436ce95..6ce2b6e 100644 (file)
--- a/tests/test_rtd.py
+++ b/tests/test_rtd.py
@@ -11,6 +11,7 @@
 
 import json
 import os
+
 import pytest
 import responses