Merge ~vultaire/charm-logrotated:black-20.08 into charm-logrotated:master

[Paul Goins]

Blackened repository to 88 lines

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

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

[Paul Goins (vultaire)]

Just rebased today.

[Xav Paice (xavpaice)]

lgtm

review: Approve

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

Change successfully merged at revision 1ec74c351769c8e778ae23604e379b1b3c6540f3

diff --git a/src/actions/actions.py b/src/actions/actions.py
index 8178850..dd311d4 100755
--- a/src/actions/actions.py
+++ b/src/actions/actions.py
@@ -10,7 +10,7 @@ from lib_cron import CronHelper
 
 from lib_logrotate import LogrotateHelper
 
-sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
+sys.path.insert(0, os.path.join(os.environ["CHARM_DIR"], "lib"))
 
 hooks = hookenv.Hooks()
 logrotate = LogrotateHelper()
diff --git a/src/lib/lib_cron.py b/src/lib/lib_cron.py
index b7d24c4..5c17738 100644
--- a/src/lib/lib_cron.py
+++ b/src/lib/lib_cron.py
@@ -24,9 +24,9 @@ class CronHelper:
         """
         config_file = open(self.cronjob_etc_config, "r")
         lines = config_file.read()
-        lines = lines.split('\n')
+        lines = lines.split("\n")
 
-        if lines[0] == 'True':
+        if lines[0] == "True":
             self.cronjob_enabled = True
         else:
             self.cronjob_enabled = False
@@ -43,17 +43,22 @@ class CronHelper:
 
         if self.cronjob_enabled is True:
             cronjob_path = os.path.realpath(__file__)
-            cron_file_path = self.cronjob_base_path\
-                + self.cronjob_check_paths[clean_up_file]\
-                + "/" + self.cronjob_logrotate_cron_file
+            cron_file_path = (
+                self.cronjob_base_path
+                + self.cronjob_check_paths[clean_up_file]
+                + "/"
+                + self.cronjob_logrotate_cron_file
+            )
 
             logrotate_unit = hookenv.local_unit()
-            python_venv_path = os.getcwd().replace('charm', '') + '.venv/bin/python3'
+            python_venv_path = os.getcwd().replace("charm", "") + ".venv/bin/python3"
             # upgrade to template if logic increases
-            cron_file = open(cron_file_path, 'w')
+            cron_file = open(cron_file_path, "w")
             cron_job = """#!/bin/bash
 /usr/bin/sudo /usr/bin/juju-run {} "{} {}"
-""".format(logrotate_unit, python_venv_path, cronjob_path)
+""".format(
+                logrotate_unit, python_venv_path, cronjob_path
+            )
             cron_file.write(cron_job)
             cron_file.close()
             os.chmod(cron_file_path, 700)
@@ -64,7 +69,12 @@ class CronHelper:
         """Cleanup previous config."""
         if frequency == -1:
             for check_path in self.cronjob_check_paths:
-                path = self.cronjob_base_path + check_path + "/" + self.cronjob_logrotate_cron_file
+                path = (
+                    self.cronjob_base_path
+                    + check_path
+                    + "/"
+                    + self.cronjob_logrotate_cron_file
+                )
                 if os.path.exists(path):
                     os.remove(path)
             if os.path.exists(self.cronjob_etc_config):
@@ -79,13 +89,13 @@ class CronHelper:
 
 def main():
     """Ran by cron."""
-    hookenv.status_set('maintenance', 'Executing cron job.')
+    hookenv.status_set("maintenance", "Executing cron job.")
     cronhelper = CronHelper()
     cronhelper.read_config()
     cronhelper.update_logrotate_etc()
     cronhelper.install_cronjob()
-    hookenv.status_set('active', 'Unit is ready.')
+    hookenv.status_set("active", "Unit is ready.")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/src/lib/lib_logrotate.py b/src/lib/lib_logrotate.py
index d8c4327..497f609 100644
--- a/src/lib/lib_logrotate.py
+++ b/src/lib/lib_logrotate.py
@@ -13,9 +13,9 @@ class LogrotateHelper:
 
     def __init__(self):
         """Init function."""
-        self.retention = hookenv.config('logrotate-retention')
+        self.retention = hookenv.config("logrotate-retention")
         self.override_interval_regex = re.compile("(daily|weekly|monthly|yearly)")
-        self.override = json.loads(hookenv.config('override'))
+        self.override = json.loads(hookenv.config("override"))
         self.override_files = self.get_override_files()
 
     def read_config(self):
@@ -26,7 +26,7 @@ class LogrotateHelper:
         """
         config_file = open("/etc/logrotate_cronjob_config", "r")
         lines = config_file.read()
-        lines = lines.split('\n')
+        lines = lines.split("\n")
 
         self.retention = int(lines[2])
 
@@ -35,7 +35,7 @@ class LogrotateHelper:
         for config_file in os.listdir(LOGROTATE_DIR):
             file_path = LOGROTATE_DIR + config_file
 
-            logrotate_file = open(file_path, 'r')
+            logrotate_file = open(file_path, "r")
             content = logrotate_file.read()
             logrotate_file.close()
 
@@ -43,14 +43,17 @@ class LogrotateHelper:
 
             mod_contents = self.modify_header(mod_contents)
 
-            logrotate_file = open(file_path, 'w')
+            logrotate_file = open(file_path, "w")
             logrotate_file.write(mod_contents)
             logrotate_file.close()
 
     def get_override_files(self):
         """Return paths for files to be overrided."""
-        return [path['path'] for path in self.override
-                if set(path.keys()) == {'path', 'rotate', 'interval'}]
+        return [
+            path["path"]
+            for path in self.override
+            if set(path.keys()) == {"path", "rotate", "interval"}
+        ]
 
     def get_override_settings(self, file_path):
         """Return settings in key:value pairs for the file_path requested.
@@ -58,22 +61,22 @@ class LogrotateHelper:
         param: file_path: path to the file for manual settings.
         """
         for override_entry in self.override:
-            if file_path == override_entry['path']:
-                rotate = override_entry['rotate']
-                interval = override_entry['interval']
-        return {'rotate': rotate, 'interval': interval}
+            if file_path == override_entry["path"]:
+                rotate = override_entry["rotate"]
+                interval = override_entry["interval"]
+        return {"rotate": rotate, "interval": interval}
 
     def modify_content(self, content, file_path):
         """Edit the content of a logrotate file."""
         # Split the contents in a logrotate file in separate entries (if
         # multiple are found in the file) and put in a list for further
         # processing
-        split = content.split('\n')
+        split = content.split("\n")
         items = []
         string = ""
         for row in split:
-            string += row + '\n'
-            if '}' in row:
+            string += row + "\n"
+            if "}" in row:
                 items.append(string)
                 string = ""
                 continue
@@ -84,35 +87,37 @@ class LogrotateHelper:
         for item in items:
             # Override rotate, if defined
             if file_path in self.override_files:
-                count = self.get_override_settings(file_path)['rotate']
+                count = self.get_override_settings(file_path)["rotate"]
             else:
                 count = self.calculate_count(item, self.retention)
-            rotate = 'rotate {}'.format(count)
+            rotate = "rotate {}".format(count)
             # if rotate is missing, add it as last line in the item entry
-            if 'rotate' in item:
-                result = re.sub(r'rotate \d+\.?[0-9]*', rotate, item)
+            if "rotate" in item:
+                result = re.sub(r"rotate \d+\.?[0-9]*", rotate, item)
             else:
-                result = item.replace('}', '    ' + rotate + '\n}')
+                result = item.replace("}", "    " + rotate + "\n}")
             results.append(result)
 
-        results = '\n'.join(results)
+        results = "\n".join(results)
 
         # Override interval, if defined
         if file_path in self.override_files:
-            interval = self.get_override_settings(file_path)['interval']
+            interval = self.get_override_settings(file_path)["interval"]
             results = self.override_interval_regex.sub(interval, results)
 
         return results
 
     def modify_header(self, content):
         """Add Juju headers to the file."""
-        header = "# Configuration file maintained by Juju. Local changes may be overwritten"
+        header = (
+            "# Configuration file maintained by Juju. Local changes may be overwritten"
+        )
 
-        split = content.split('\n')
+        split = content.split("\n")
         if split[0].startswith(header):
             result = content
         else:
-            result = header + '\n' + content
+            result = header + "\n" + content
 
         return result
 
@@ -123,16 +128,16 @@ class LogrotateHelper:
         # better to keep the logs than lose them
         count = retention
         # Daily 1:1 to configuration retention period (in days)
-        if 'daily' in item:
+        if "daily" in item:
             count = retention
         # Weekly rounding up, as weeks are 7 days
-        if 'weekly' in item:
+        if "weekly" in item:
             count = int(round(retention / 7))
         # Monthly default 30 days and round up because of 28/31 days months
-        if 'monthly' in item:
+        if "monthly" in item:
             count = int(round(retention / 30))
         # For every 360 days - add 1 year
-        if 'yearly' in item:
+        if "yearly" in item:
             count = retention // 360 + 1 if retention > 360 else 1
 
         return count
diff --git a/src/reactive/logrotate.py b/src/reactive/logrotate.py
index b0e349a..119ac96 100644
--- a/src/reactive/logrotate.py
+++ b/src/reactive/logrotate.py
@@ -13,7 +13,7 @@ logrotate = LogrotateHelper()
 cron = CronHelper()
 
 
-@when_not('logrotate.installed')
+@when_not("logrotate.installed")
 def install_logrotate():
     """Install the logrotate charm."""
     try:
@@ -23,32 +23,32 @@ def install_logrotate():
         logrotate.modify_configs()
         cron.install_cronjob()
     except Exception as ex:
-        hookenv.status_set('blocked', str(ex))
-    hookenv.status_set('active', 'Unit is ready.')
-    set_flag('logrotate.installed')
+        hookenv.status_set("blocked", str(ex))
+    hookenv.status_set("active", "Unit is ready.")
+    set_flag("logrotate.installed")
 
 
-@when('config.changed')
+@when("config.changed")
 def config_changed():
     """Run when configuration changes."""
     try:
         dump_config_to_disk()
         cron.read_config()
         logrotate.read_config()
-        hookenv.status_set('maintenance', 'Modifying configs.')
+        hookenv.status_set("maintenance", "Modifying configs.")
         logrotate.modify_configs()
         cron.install_cronjob()
     except Exception as ex:
-        hookenv.status_set('blocked', str(ex))
-    hookenv.status_set('active', 'Unit is ready.')
+        hookenv.status_set("blocked", str(ex))
+    hookenv.status_set("active", "Unit is ready.")
 
 
 def dump_config_to_disk():
     """Dump configurations to disk."""
-    cronjob_enabled = hookenv.config('logrotate-cronjob')
-    cronjob_frequency = hookenv.config('logrotate-cronjob-frequency')
-    logrotate_retention = hookenv.config('logrotate-retention')
-    with open('/etc/logrotate_cronjob_config', 'w+') as cronjob_config_file:
-        cronjob_config_file.write(str(cronjob_enabled) + '\n')
-        cronjob_config_file.write(str(cronjob_frequency) + '\n')
-        cronjob_config_file.write(str(logrotate_retention) + '\n')
+    cronjob_enabled = hookenv.config("logrotate-cronjob")
+    cronjob_frequency = hookenv.config("logrotate-cronjob-frequency")
+    logrotate_retention = hookenv.config("logrotate-retention")
+    with open("/etc/logrotate_cronjob_config", "w+") as cronjob_config_file:
+        cronjob_config_file.write(str(cronjob_enabled) + "\n")
+        cronjob_config_file.write(str(cronjob_frequency) + "\n")
+        cronjob_config_file.write(str(logrotate_retention) + "\n")
diff --git a/src/tests/functional/conftest.py b/src/tests/functional/conftest.py
index 1b22cb8..2cc4343 100644
--- a/src/tests/functional/conftest.py
+++ b/src/tests/functional/conftest.py
@@ -21,7 +21,7 @@ from juju_tools import JujuTools
 import pytest
 
 
[e-mail](scope='module')
[e-mail](scope="module")
 def event_loop():
     """Override the default pytest event loop.
 
@@ -35,7 +35,7 @@ def event_loop():
     asyncio.set_event_loop(None)
 
 
[e-mail](scope='module')
[e-mail](scope="module")
 async def controller():
     """Connect to the current controller."""
     _controller = Controller()
@@ -44,27 +44,28 @@ async def controller():
     await _controller.disconnect()
 
 
[e-mail](scope='module')
[e-mail](scope="module")
 async def model(controller):
     """Live only for the duration of the test."""
     model_name = "functest-{}".format(str(uuid.uuid4())[-12:])
-    _model = await controller.add_model(model_name,
-                                        cloud_name=os.getenv('PYTEST_CLOUD_NAME'),
-                                        region=os.getenv('PYTEST_CLOUD_REGION'),
-                                        )
+    _model = await controller.add_model(
+        model_name,
+        cloud_name=os.getenv("PYTEST_CLOUD_NAME"),
+        region=os.getenv("PYTEST_CLOUD_REGION"),
+    )
     # https://github.com/juju/python-libjuju/issues/267
-    subprocess.check_call(['juju', 'models'])
+    subprocess.check_call(["juju", "models"])
     while model_name not in await controller.list_models():
         await asyncio.sleep(1)
     yield _model
     await _model.disconnect()
-    if not os.getenv('PYTEST_KEEP_MODEL'):
+    if not os.getenv("PYTEST_KEEP_MODEL"):
         await controller.destroy_model(model_name)
         while model_name in await controller.list_models():
             await asyncio.sleep(1)
 
 
[e-mail](scope='module')
[e-mail](scope="module")
 async def jujutools(controller, model):
     """Juju tools."""
     tools = JujuTools(controller, model)
diff --git a/src/tests/functional/juju_tools.py b/src/tests/functional/juju_tools.py
index 5e4a1cc..6ce6f10 100644
--- a/src/tests/functional/juju_tools.py
+++ b/src/tests/functional/juju_tools.py
@@ -37,14 +37,17 @@ class JujuTools:
         :param target: Unit object or unit name string
         """
         python3 = "python3 -c '{}'"
-        python_cmd = ('import pickle;'
-                      'import base64;'
-                      '{}'
-                      'print(base64.b64encode(pickle.dumps({})), end="")'
-                      .format(imports, remote_cmd))
+        python_cmd = (
+            "import pickle;"
+            "import base64;"
+            "{}"
+            'print(base64.b64encode(pickle.dumps({})), end="")'.format(
+                imports, remote_cmd
+            )
+        )
         cmd = python3.format(python_cmd)
         results = await self.run_command(cmd, target)
-        return pickle.loads(base64.b64decode(bytes(results['Stdout'][2:-1], 'utf8')))
+        return pickle.loads(base64.b64decode(bytes(results["Stdout"][2:-1], "utf8")))
 
     async def file_stat(self, path, target):
         """Run stat on a file.
@@ -52,9 +55,8 @@ class JujuTools:
         :param path: File path
         :param target: Unit object or unit name string
         """
-        imports = 'import os;'
-        python_cmd = ('os.stat("{}")'
-                      .format(path))
+        imports = "import os;"
+        python_cmd = 'os.stat("{}")'.format(path)
         print("Calling remote cmd: " + python_cmd)
         return await self.remote_object(imports, python_cmd, target)
 
@@ -64,6 +66,6 @@ class JujuTools:
         :param path: File path
         :param target: Unit object or unit name string
         """
-        cmd = 'cat {}'.format(path)
+        cmd = "cat {}".format(path)
         result = await self.run_command(cmd, target)
-        return result['Stdout']
+        return result["Stdout"]
diff --git a/src/tests/functional/test_logrotate.py b/src/tests/functional/test_logrotate.py
index 936c577..68ecce0 100644
--- a/src/tests/functional/test_logrotate.py
+++ b/src/tests/functional/test_logrotate.py
@@ -6,48 +6,44 @@ import os
 import pytest
 
 pytestmark = pytest.mark.asyncio
-SERIES = ['xenial',
-          'bionic',
-          'focal',
-          ]
+SERIES = [
+    "xenial",
+    "bionic",
+    "focal",
+]
 
 
 ############
 # FIXTURES #
 ############
 
[e-mail](scope='module',
-                params=SERIES)
+
[e-mail](scope="module", params=SERIES)
 async def deploy_app(request, model):
     """Deploy the logrotate charm as a subordinate of ubuntu."""
     release = request.param
 
     await model.deploy(
-        'ubuntu',
-        application_name='ubuntu-' + release,
-        series=release,
-        channel='stable'
+        "ubuntu", application_name="ubuntu-" + release, series=release, channel="stable"
     )
     logrotate_app = await model.deploy(
-        '{}/logrotated'.format(os.getenv('CHARM_BUILD_DIR')),
-        application_name='logrotate-' + release,
+        "{}/logrotated".format(os.getenv("CHARM_BUILD_DIR")),
+        application_name="logrotate-" + release,
         series=release,
         num_units=0,
     )
-    await model.add_relation(
-        'ubuntu-' + release,
-        'logrotate-' + release
-    )
+    await model.add_relation("ubuntu-" + release, "logrotate-" + release)
 
-    await model.block_until(lambda: logrotate_app.status == 'active')
+    await model.block_until(lambda: logrotate_app.status == "active")
     yield logrotate_app
 
 
[e-mail](scope='module')
[e-mail](scope="module")
 async def unit(deploy_app):
     """Return the logrotate unit we've deployed."""
     return deploy_app.units.pop()
 
+
 #########
 # TESTS #
 #########
@@ -55,4 +51,4 @@ async def unit(deploy_app):
 
 async def test_deploy(deploy_app):
     """Tst the deployment."""
-    assert deploy_app.status == 'active'
+    assert deploy_app.status == "active"
diff --git a/src/tests/unit/conftest.py b/src/tests/unit/conftest.py
index b4c0517..2bb8eb8 100644
--- a/src/tests/unit/conftest.py
+++ b/src/tests/unit/conftest.py
@@ -12,19 +12,20 @@ import pytest
 def mock_layers(monkeypatch):
     """Layers mock."""
     import sys
-    sys.modules['charms.layer'] = mock.Mock()
-    sys.modules['reactive'] = mock.Mock()
+
+    sys.modules["charms.layer"] = mock.Mock()
+    sys.modules["reactive"] = mock.Mock()
     # Mock any functions in layers that need to be mocked here
 
     def options(layer):
         # mock options for layers here
-        if layer == 'example-layer':
-            options = {'port': 9999}
+        if layer == "example-layer":
+            options = {"port": 9999}
             return options
         else:
             return None
 
-    monkeypatch.setattr('lib_logrotate.layer.options', options)
+    monkeypatch.setattr("lib_logrotate.layer.options", options)
 
 
 @pytest.fixture
@@ -34,38 +35,39 @@ def mock_hookenv_config(monkeypatch):
 
     def mock_config():
         cfg = {}
-        yml = yaml.load(open('./config.yaml'))
+        yml = yaml.load(open("./config.yaml"))
 
         # Load all defaults
-        for key, value in yml['options'].items():
-            cfg[key] = value['default']
+        for key, value in yml["options"].items():
+            cfg[key] = value["default"]
 
         # Manually add cfg from other layers
         # cfg['my-other-layer'] = 'mock'
         return cfg
 
-    monkeypatch.setattr('lib_logrotate.hookenv.config', mock_config)
+    monkeypatch.setattr("lib_logrotate.hookenv.config", mock_config)
 
 
 @pytest.fixture
 def mock_remote_unit(monkeypatch):
     """Remote unit mock."""
-    monkeypatch.setattr('lib_logrotate.hookenv.remote_unit', lambda: 'unit-mock/0')
+    monkeypatch.setattr("lib_logrotate.hookenv.remote_unit", lambda: "unit-mock/0")
 
 
 @pytest.fixture
 def mock_charm_dir(monkeypatch):
     """Charm dir mock."""
-    monkeypatch.setattr('lib_logrotate.hookenv.charm_dir', lambda: '/mock/charm/dir')
+    monkeypatch.setattr("lib_logrotate.hookenv.charm_dir", lambda: "/mock/charm/dir")
 
 
 @pytest.fixture
 def logrotate(tmpdir, mock_hookenv_config, mock_charm_dir, monkeypatch):
     """Logrotate fixture."""
     from lib_logrotate import LogrotateHelper
+
     helper = LogrotateHelper
 
     # Any other functions that load helper will get this version
-    monkeypatch.setattr('lib_logrotate.LogrotateHelper', lambda: helper)
+    monkeypatch.setattr("lib_logrotate.LogrotateHelper", lambda: helper)
 
     return helper
diff --git a/src/tests/unit/test_logrotate.py b/src/tests/unit/test_logrotate.py
index 68ed164..b317257 100644
--- a/src/tests/unit/test_logrotate.py
+++ b/src/tests/unit/test_logrotate.py
@@ -1,7 +1,7 @@
 """Main unit test module."""
 
 
-class TestLogrotateHelper():
+class TestLogrotateHelper:
     """Main test class."""
 
     def test_pytest(self):
@@ -11,28 +11,28 @@ class TestLogrotateHelper():
     def test_daily_retention_count(self, logrotate):
         """Test daily retention count."""
         logrotate.retention = 90
-        contents = '/var/log/some.log {\n  rotate 123\n  daily\n}'
+        contents = "/var/log/some.log {\n  rotate 123\n  daily\n}"
         count = logrotate.calculate_count(contents, logrotate.retention)
         assert count == 90
 
     def test_weekly_retention_count(self, logrotate):
         """Test weekly retention count."""
         logrotate.retention = 21
-        contents = '/var/log/some.log {\n  rotate 123\n  weekly\n}'
+        contents = "/var/log/some.log {\n  rotate 123\n  weekly\n}"
         count = logrotate.calculate_count(contents, logrotate.retention)
         assert count == 3
 
     def test_monthly_retention_count(self, logrotate):
         """Test monthly retention count."""
         logrotate.retention = 60
-        contents = '/var/log/some.log {\n  rotate 123\n  monthly\n}'
+        contents = "/var/log/some.log {\n  rotate 123\n  monthly\n}"
         count = logrotate.calculate_count(contents, logrotate.retention)
         assert count == 2
 
     def test_yearly_retention_count(self, logrotate):
         """Test yearly retention count."""
         logrotate.retention = 180
-        contents = '/var/log/some.log {\n  rotate 123\n  yearly\n}'
+        contents = "/var/log/some.log {\n  rotate 123\n  yearly\n}"
         count = logrotate.calculate_count(contents, logrotate.retention)
         assert count == 1
 
@@ -42,9 +42,15 @@ class TestLogrotateHelper():
         logrotate.retention = 42
         logrotate.override = []
         logrotate.override_files = []
-        contents = '/log/some.log {\n  rotate 123\n  daily\n}\n/log/other.log {\n  rotate 456\n  weekly\n}'
+        contents = (
+            "/log/some.log {\n  rotate 123\n  daily\n}\n"
+            "/log/other.log {\n  rotate 456\n  weekly\n}"
+        )
         mod_contents = logrotate.modify_content(logrotate, contents, file_path)
-        expected_contents = '/log/some.log {\n  rotate 42\n  daily\n}\n\n/log/other.log {\n  rotate 6\n  weekly\n}\n'
+        expected_contents = (
+            "/log/some.log {\n  rotate 42\n  daily\n}\n\n"
+            "/log/other.log {\n  rotate 6\n  weekly\n}\n"
+        )
         assert mod_contents == expected_contents
 
     def test_modify_content_override(self, logrotate):
@@ -53,7 +59,13 @@ class TestLogrotateHelper():
         logrotate.retention = 42
         logrotate.override = []
         logrotate.override_files = []
-        contents = '/log/some.log {\n  rotate 123\n  daily\n}\n/log/other.log {\n  rotate 456\n  weekly\n}'
+        contents = (
+            "/log/some.log {\n  rotate 123\n  daily\n}\n"
+            "/log/other.log {\n  rotate 456\n  weekly\n}"
+        )
         mod_contents = logrotate.modify_content(logrotate, contents, file_path)
-        expected_contents = '/log/some.log {\n  rotate 42\n  daily\n}\n\n/log/other.log {\n  rotate 6\n  weekly\n}\n'
+        expected_contents = (
+            "/log/some.log {\n  rotate 42\n  daily\n}\n\n"
+            "/log/other.log {\n  rotate 6\n  weekly\n}\n"
+        )
         assert mod_contents == expected_contents
diff --git a/src/tox.ini b/src/tox.ini
index 78da1be..2900ead 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -25,7 +25,7 @@ passenv =
 [testenv:lint]
 commands =
     flake8
-#TODO    black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
+    black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
 deps =
     black
     flake8
@@ -43,12 +43,9 @@ exclude =
     mod,
     .build
 
-#max-line-length = 88
+max-line-length = 88
 max-complexity = 10
 
-# from old tox.ini
-max-line-length = 120
-
 [testenv:black]
 commands =
     black --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .