Pre merge code quality checks (#72)

* fix files with flake8

* bump version for per merge checks

.dockerignore

@@ -7,3 +7,4 @@ tests/
 .coveragerc
 .travis.yml
 doc/
+.flake8

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+ignore = E501

.travis.yml

@@ -6,6 +6,7 @@ services:
 
 script:
   - ./run_tests.sh
+  - flake8
 
 after_script:
   - codecov

dev-environment.yml

@@ -8,4 +8,5 @@ dependencies:
       - pytest
       - pytest-cov
       - pytest-mock
-      - codecov
+      - codecov
+      - flake8

ouroboros/cli.py

@@ -6,7 +6,7 @@
 
 def checkURI(uri):
     """Validate tcp:// regex"""
-    regex = re.compile( r"""(?xi) # "verbose" mode & case-insensitive
+    regex = re.compile(r"""(?xi) # "verbose" mode & case-insensitive
         \A                        # in the beginning...
         tcps?://                  # tcp or tcps protocol
         (?:                       # hostname / IP address
@@ -46,8 +46,7 @@ def get_int_env_var(env_var):
 def parse(sysargs):
     """Declare command line options"""
     parser = argparse.ArgumentParser(description='ouroboros',
-                                     epilog='Example: ouroboros -u tcp://1.2.3.4:5678'
-                                     + '-i 20 -m container1 container2 -l warn')
+                                     epilog='Example: ouroboros -u tcp://1.2.3.4:5678 -i 20 -m container1 container2 -l warn')
 
     parser.add_argument('-u', '--url', default=defaults.LOCAL_UNIX_SOCKET,
                         help='Url for tcp host (defaults to "unix://var/run/docker.sock")')

requirements-dev.txt

@@ -5,4 +5,5 @@ requests
 pytest
 pytest-cov
 pytest-mock
-codecov
+codecov
+flake8

setup.py

@@ -13,7 +13,7 @@ def read_reqs(requirements):
 
 setup(
     name='ouroboros-cli',
-    version='0.4.0',
+    version='0.4.1',
     description='Automatically update running docker containers',
     long_description=readme(),
     long_description_content_type='text/markdown',

tests/unit/_metrics_test.py

@@ -1,4 +1,3 @@
-import pytest
 from prometheus_client import REGISTRY
 import ouroboros.metrics as metrics
 
@@ -14,4 +13,4 @@ def test_monitored_containers():
     test_count = 5.0
     metrics.monitored_containers(num=test_count)
     num_monitored = REGISTRY.get_sample_value('containers_being_monitored')
-    assert num_monitored == test_count
+    assert num_monitored == test_count

tests/unit/cli_test.py

@@ -215,6 +215,7 @@ def test_metrics_port_arg_invalid_value(mocker):
         cli.parse(['--metrics-port', 'test'])
         assert pytest_wrapped_e.type == SystemExit
 
+
 # Webhooks
 @pytest.mark.parametrize('webhook_args, webhook_result', [
     (['-w', 'http://my-webhook-1 ', 'http://my-webhook-2', 'http://my-webhook-3'], ['http://my-webhook-1 ', 'http://my-webhook-2', 'http://my-webhook-3']),

tests/unit/container_object.py

@@ -225,4 +225,4 @@
             }
         }
     }
-}
+}

tests/unit/container_test.py

@@ -5,6 +5,7 @@
 import ouroboros.defaults
 import logging
 
+
 @pytest.fixture()
 def fake_container():
     return container_object

tests/unit/defaults_test.py

@@ -1,6 +1,7 @@
 import pytest
 import ouroboros.defaults as defaults
 
+
 @pytest.mark.parametrize('default, result', [
     (defaults.INTERVAL, 300),
     (defaults.LOCAL_UNIX_SOCKET, 'unix://var/run/docker.sock'),

tests/unit/image_test.py

@@ -1,4 +1,3 @@
-import pytest
 import ouroboros.image as image
 import docker
 

tests/unit/logger_test.py

@@ -1,6 +1,7 @@
 import pytest
 import ouroboros.logger as log
 
+
 @pytest.mark.parametrize('level_string, level_code', [
     ('debug', 10),
     ('info', 20),

tests/unit/main_unit_test.py

@@ -36,12 +36,12 @@ def test_main_full(fake_namespace, fake_api, caplog):
     fake_namespace.keep_tag = True
     fake_namespace.webhook_urls = ["http://testurl1"]
 
-    fake_api.inspect_container.return_value = container_object # called twice
-    fake_api.containers.return_value = [container_object] # called twice
+    fake_api.inspect_container.return_value = container_object  # called twice
+    fake_api.containers.return_value = [container_object]  # called twice
     fake_api.inspect_image.side_effect = [{'RepoTags': ["repo:1.1"],
                                            'Id': '1'},
                                           {'RepoTags': ["repo:latest"],
-                                           'Id': '2'}] # called twice
+                                           'Id': '2'}]  # called twice
     fake_api.create_container.return_value = {'Id': '2'}
 
     with pytest.raises(SystemExit) as e:
@@ -71,7 +71,7 @@ def test_main_exception(fake_namespace, fake_api, caplog):
 
     fake_api.inspect_container.return_value = container_object  # called twice
     fake_api.containers.return_value = [container_object]  # called twice
-    fake_api.inspect_image.return_value = {'RepoTags': ["repo:1.1"], 'Id': '1'} # called once
+    fake_api.inspect_image.return_value = {'RepoTags': ["repo:1.1"], 'Id': '1'}  # called once
 
     fake_api.pull.side_effect = docker.errors.APIError("I blew up!!")
     fake_api.create_container.return_value = {'Id': '2'}

tests/unit/webhook_test.py

@@ -1,7 +1,7 @@
 import pytest
-import requests
 import ouroboros.webhook as webhook
 
+
 def test_webook_schema_error():
     with pytest.raises(Exception):
         assert webhook.post(urls=['http:/my-false-url'], container_name='test_name', old_sha='1', new_sha='2')