Merge ~peppepetra/charm-juju-controller:lint-20.08 into charm-juju-controller:master

[Giuseppe Petralia]

Fix linting

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Alvaro Uria (aluria)]

+1 I tested this together with the other 2 MPs (blacken and makefile) and all tests passed.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 05b68f515425c945952f5af7c198391653cf4975

diff --git a/src/files/plugins/check_jujucontroller.py b/src/files/plugins/check_jujucontroller.py
index 0dc0946..cc1b2e0 100755
--- a/src/files/plugins/check_jujucontroller.py
+++ b/src/files/plugins/check_jujucontroller.py
@@ -9,12 +9,14 @@ This NRPE check queries the juju controller endpoint and returns the following:
   * CRITICAL in any other case
 """
 
-from enum import Enum
 import sys
+from enum import Enum
 
 import requests
 from requests.exceptions import RequestException
+
 import semver
+
 import yaml
 
 # Code duplication, I know, but importing from lib_juju_controller.py is not
diff --git a/src/lib/lib_juju_controller.py b/src/lib/lib_juju_controller.py
index 2b45272..6432c3c 100644
--- a/src/lib/lib_juju_controller.py
+++ b/src/lib/lib_juju_controller.py
@@ -5,6 +5,7 @@ import os
 import shutil
 
 from charmhelpers.core import hookenv
+
 import yaml
 
 AGENTDIRGLOB = "/var/lib/juju/agents/machine-*"
diff --git a/src/reactive/juju_controller.py b/src/reactive/juju_controller.py
index 5905b53..25efd3d 100644
--- a/src/reactive/juju_controller.py
+++ b/src/reactive/juju_controller.py
@@ -7,6 +7,7 @@ import os
 
 from charmhelpers.contrib.charmsupport import nrpe
 from charmhelpers.core import hookenv
+
 from charms.reactive import (
     clear_flag,
     hook,
@@ -15,6 +16,7 @@ from charms.reactive import (
     when_file_changed,
     when_not,
 )
+
 from lib_juju_controller import JujuControllerHelper
 
 helper = JujuControllerHelper()
diff --git a/src/tests/functional/tests/tests_juju_controller.py b/src/tests/functional/tests/tests_juju_controller.py
index 3fd5229..da69629 100644
--- a/src/tests/functional/tests/tests_juju_controller.py
+++ b/src/tests/functional/tests/tests_juju_controller.py
@@ -2,9 +2,8 @@
 """Functional tests module."""
 import json
 import os
-from pathlib import Path
 import unittest
-
+from pathlib import Path
 
 from zaza import model, sync_wrapper
 from zaza.charm_lifecycle import utils as lifecycle_utils
diff --git a/src/tests/unit/conftest.py b/src/tests/unit/conftest.py
index b67d094..64f110c 100644
--- a/src/tests/unit/conftest.py
+++ b/src/tests/unit/conftest.py
@@ -3,9 +3,13 @@
 import os
 
 from charmhelpers.core import unitdata
+
 import mock
+
 import pytest
+
 import responses
+
 import yaml
 
 
diff --git a/src/tests/unit/test_check_jujucontroller.py b/src/tests/unit/test_check_jujucontroller.py
index e6cad4a..fd10e36 100644
--- a/src/tests/unit/test_check_jujucontroller.py
+++ b/src/tests/unit/test_check_jujucontroller.py
@@ -4,6 +4,7 @@ import os
 import sys
 
 import pytest
+
 import responses
 
 PLUGINS_DIR = os.path.join(os.path.dirname(__file__), "../../files/plugins")
diff --git a/src/tox.ini b/src/tox.ini
index 463f0a4..24fb13b 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -29,9 +29,9 @@ commands =
 deps =
     black
     flake8
-#TODO    flake8-docstrings
-#TODO    flake8-import-order
-#TODO    pep8-naming
+    flake8-docstrings
+    flake8-import-order
+    pep8-naming
     flake8-colors
 
 [flake8]