isort now

.python-version

@@ -1,3 +1 @@
-3.7.3
-3.6.8
-2.7.16
+3.7.4

Makefile

@@ -11,6 +11,10 @@ init:
 	$(MAKE) clean
 	$(MAKE) pyenv_init
 	$(MAKE) pipenv_init
+	$(MAKE) pipenv_install_lint
+	$(MAKE) pipenv_install_dev
+	$(MAKE) pipenv_install_docs
+	$(MAKE) pipenv_install_build
 
 pip_install_tools:
 	pip install --quiet --upgrade --requirement requirements-pkg.txt
@@ -35,37 +39,29 @@ pyenv_init:
 	pyenv local 3.7.4 || true
 
 lint:
-	$(MAKE) pipenv_install_lint
 	pipenv run which black && black $(PACKAGE) setup.py
+	pipenv run isort -y $(PACKAGE) setup.py
 	pipenv run pydocstyle $(PACKAGE) setup.py
 	pipenv run flake8 --max-line-length 89 $(PACKAGE) setup.py
 	pipenv run bandit -r . --skip B101 -x playground.py,setup.py
 
 test:
-	$(MAKE) pipenv_install_dev
 	pipenv run pytest -rA --junitxml=junit-report.xml --cov-config=.coveragerc --cov-report=term --cov-report xml --cov-report=html:cov_html --cov=$(PACKAGE) --showlocals --log-cli-level=INFO --verbose --exitfirst $(PACKAGE)/tests
 
 test_debug:
-	$(MAKE) pipenv_install_dev
 	pipenv run pytest -rA --capture=no --showlocals --log-cli-level=DEBUG --verbose --exitfirst $(PACKAGE)/tests
 
 docs:
-	$(MAKE) pipenv_install_docs
 	(cd docs && pipenv run make html SPHINXOPTS="-Wna" && cd ..)
 
-docs_dev:
-	(cd docs && pipenv run make html SPHINXOPTS="-Wnv" && cd ..)
-
 make docs_open:
 	open docs/_build/html/index.html
 
 docs_coverage:
-	$(MAKE) pipenv_install_docs
 	(cd docs && pipenv run make coverage && cd ..)
 	cat docs/_build/coverage/python.txt
 
 docs_linkcheck:
-	$(MAKE) pipenv_install_docs
 	(cd docs && pipenv run make linkcheck && cd ..)
 	cat docs/_build/linkcheck/output.txt
 
@@ -88,7 +84,6 @@ pkg_publish:
 
 pkg_build:
 	$(MAKE) clean_build
-	$(MAKE) pipenv_install_build
 
 	@echo "*** Building Source and Wheel (universal) distribution"
 	pipenv run python setup.py sdist bdist_wheel --universal
@@ -108,8 +103,7 @@ clean_tests:
 	rm -rf .egg .eggs junit-report.xml cov_html .tox .pytest_cache .coverage
 
 clean_docs:
-	$(MAKE) pipenv_install_docs
-	(cd docs && pipenv run make clean && cd ..)
+	rm -rf docs/_build
 
 clean_pipenv:
 	pipenv --rm || true

Makefile.help

@@ -8,10 +8,10 @@ pipenv_init             build a venv using pipenv
 pyenv_init              setup pyenv with python 3.7.3, 3.6.8, 2.7.16
 
 # docs
-docs                    make pipenv_install_docs, run docs/make html and rebuild ALL docs
-docs_dev                make pipenv_install_docs, run docs/make html and only rebuild changed docs
-docs_coverage           make pipenv_install_docs, run docs/make coverage
-docs_linkcheck          make pipenv_install_docs, run docs/make linkcheck
+docs                    run docs/make html and rebuild ALL docs
+docs_dev                run docs/make html and only rebuild changed docs
+docs_coverage           run docs/make coverage
+docs_linkcheck          run docs/make linkcheck
 docs_open               open built docs (osx only)
 
 # git fun
@@ -23,9 +23,9 @@ pkg_build               make clean, make pipenv_install_build, build the package
 pkg_publish             make lint, make pkg_build, make git_check, publish the package to pypi
 
 # testing
-lint                    make pipenv_install_lint, run black, flake8, and bandit
-test                    make pipenv_install_dev, run pytest with coverage reports
-test_debug              make pipenv_install_dev, run pytest with logging at debug
+lint                    run black, isort, pydocstyle, flake8, and bandit
+test                    run pytest with coverage reports
+test_debug              run pytest with logging at debug
 
 # clean up
 clean_docs              make pipenv_install_docs, run docs/make clean
@@ -39,4 +39,4 @@ clean                   make clean_files, make clean_build, make clean_tests, ma
 help                    this...
 
 # call me first
-init                    make pip_install_tools, make clean, make py_env, make pipenv_init
+init                    make pip_install_tools, make clean, make py_env, make pipenv_init, make pipenv_install_*

axonius_api_client/__init__.py

@@ -1,15 +1,12 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from . import api, auth, http, exceptions, version, tools, logs, constants, cli, models
-from .api import Users, Devices, Actions, Adapters, Enforcements
-from .auth import AuthUser, AuthKey
-from .http import HttpClient, UrlParser
+from . import api, auth, cli, constants, exceptions, http, logs, models, tools, version
+from .api import Actions, Adapters, Devices, Enforcements, Users
+from .auth import AuthKey, AuthUser
 from .connect import Connect
+from .http import HttpClient, UrlParser
 
 __version__ = version.__version__
 LOG = logs.LOG

axonius_api_client/api/__init__.py

@@ -1,15 +1,12 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
+from . import mixins, routers
 from .actions import Actions
 from .adapters import Adapters
-from .users_devices import Users, Devices
 from .enforcements import Enforcements
-from . import routers, mixins
+from .users_devices import Devices, Users
 
 __all__ = (
     "Users",

axonius_api_client/api/actions.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from . import routers, mixins
+from . import mixins, routers
 
 
 class Actions(mixins.ApiMixin):

axonius_api_client/api/adapters.py

@@ -1,14 +1,11 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import re
 
-from . import routers, mixins
-from .. import tools, exceptions
+from .. import exceptions, tools
+from . import mixins, routers
 
 
 class Clients(mixins.ApiChild):

axonius_api_client/api/enforcements.py

@@ -1,12 +1,9 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from . import routers, mixins
 from .. import exceptions, tools
+from . import mixins, routers
 
 
 class Enforcements(mixins.ApiMixin):

axonius_api_client/api/mixins.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .. import exceptions, logs, constants, models
+from .. import constants, exceptions, logs, models
 
 
 class ApiMixin(models.ApiModel):

axonius_api_client/api/routers.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """Constants for this package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 
 class Router(object):

axonius_api_client/api/users_devices.py

@@ -1,12 +1,9 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from . import routers, mixins, adapters
-from .. import tools, constants, exceptions, models
+from .. import constants, exceptions, models, tools
+from . import adapters, mixins, routers
 
 
 class SavedQuery(mixins.ApiChild):

axonius_api_client/auth/__init__.py

@@ -1,12 +1,9 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
+from . import mixins
 from .auth_key import AuthKey
 from .auth_user import AuthUser
-from . import mixins
 
 __all__ = ("AuthUser", "AuthKey", "mixins")

axonius_api_client/auth/auth_key.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from .. import exceptions, models
 from . import mixins

axonius_api_client/auth/auth_user.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from .. import exceptions, models
 from . import mixins

axonius_api_client/auth/mixins.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
 """Axonius API Client package."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .. import api, exceptions, logs, constants
+from .. import api, constants, exceptions, logs
 
 
 class AuthMixins(object):

axonius_api_client/cli/__init__.py

@@ -1,24 +1,21 @@
 # -*- coding: utf-8 -*-
 """Command line interface for Axonius API Client."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import os
 
 import click
 
+from .. import constants, logs, tools, version
 from . import (
-    context,
-    cmd_object_get,
-    cmd_object_fields,
-    cmd_object_adapters,
     cmd_adapters_get,
     cmd_adapters_get_clients,
+    cmd_object_adapters,
+    cmd_object_fields,
+    cmd_object_get,
     cmd_shell,
+    context,
 )
-from .. import tools, constants, version, logs
 
 AX_DOTENV = os.environ.get("AX_DOTENV", "")
 CWD_PATH = tools.path.resolve(os.getcwd())

axonius_api_client/cli/cmd_adapters_get.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """Command line interface for Axonius API Client."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import click
 

axonius_api_client/cli/cmd_adapters_get_clients.py

@@ -1,14 +1,11 @@
 # -*- coding: utf-8 -*-
 """Command line interface for Axonius API Client."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import click
 
-from . import context
 from .. import tools
+from . import context
 
 
 @click.command("get-clients", context_settings=context.CONTEXT_SETTINGS)

axonius_api_client/cli/cmd_object_adapters.py

@@ -1,14 +1,11 @@
 # -*- coding: utf-8 -*-
 """Command line interface for Axonius API Client."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import click
 
-from . import context
 from .. import tools
+from . import context
 
 
 @click.command("adapters", context_settings=context.CONTEXT_SETTINGS)

axonius_api_client/cli/cmd_object_fields.py

@@ -1,16 +1,13 @@
 # -*- coding: utf-8 -*-
 """Command line interface for Axonius API Client."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import re
 
 import click
 
-from . import context
 from .. import tools
+from . import context
 
 
 @click.command("fields", context_settings=context.CONTEXT_SETTINGS)

axonius_api_client/cli/cmd_object_get.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """Command line interface for Axonius API Client."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import click