Testing pre-commit flake8 hook.

Author: mboersma

api/migrations/0001_initial.py

@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+
+# flake8: noqa
+
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
@@ -459,4 +462,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['api']
+    complete_apps = ['api']

api/migrations/0002_auto__del_field_flavor_ssh_username__del_field_flavor_ssh_private_key_.py

@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+
+# flake8: noqa
+
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
@@ -248,4 +251,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['api']
+    complete_apps = ['api']

api/models.py

@@ -188,15 +188,16 @@ def publish(self, **kwargs):
             'ssh_keys': {},
             'admins': [],
             'formations': {}
-        }
+            }
         # add all ssh keys on the system
         for key in Key.objects.all():
-            key_id = '{0}_{1}'.format(key.owner.username, key.id)
+            key_id = "{0}_{1}".format(key.owner.username, key.id)
             databag['ssh_keys'][key_id] = key.public
         # TODO: add sharing-based key lookup, for now just owner's keys
         for formation in formations:
             keys = databag['formations'][formation.id] = []
-            owner_keys = ['{0}_{1}'.format(k.owner.username, k.id) for k in formation.owner.key_set.all()]
+            owner_keys = ["{0}_{1}".format(
+                k.owner.username, k.id) for k in formation.owner.key_set.all()]
             keys.extend(owner_keys)
         # call a celery task to update gitosis
         if settings.CHEF_ENABLED:
@@ -455,11 +456,11 @@ def converge(self, databag):
             # converge all backends
             backend_nodes = [b.node for b in self.backend_set.all()]
             job = group(*[n.converge() for n in backend_nodes])
-            _results = job.apply_async().join()
+            job.apply_async().join()
             # converge all proxies
             proxy_nodes = [b.node for b in self.proxy_set.all()]
             job = group(*[n.converge() for n in proxy_nodes])
-            _results = job.apply_async().join()
+            job.apply_async().join()
         return databag
 
     def destroy(self):

api/tests/auth.py

@@ -30,11 +30,16 @@ def test_auth(self):
         username, password = 'newuser', 'password'
         first_name, last_name = 'Otto', 'Test'
         email = 'autotest@deis.io'
-        submit = {'username': username, 'password': password,
-                  'first_name': first_name, 'last_name': last_name,
-                  'email': email,
-                  # try to abuse superuser/staff level perms
-                  'is_superuser': True, 'is_staff': True}
+        submit = {
+            'username': username,
+            'password': password,
+            'first_name': first_name,
+            'last_name': last_name,
+            'email': email,
+            # try to abuse superuser/staff level perms
+            'is_superuser': True,
+            'is_staff': True,
+            }
         url = '/api/register'
         response = self.client.post(url, json.dumps(submit), content_type='application/json')
         self.assertEqual(response.status_code, 201)
@@ -55,4 +60,4 @@ def test_auth(self):
         url = '/api/flavors'
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data['count'], 8) # 8 regions
+        self.assertEqual(response.data['count'], 8)  # 8 regions

api/tests/build.py

@@ -29,8 +29,11 @@ def setUp(self):
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
         url = '/api/flavors'
-        body = {'id': 'autotest', 'provider': 'autotest',
-                'params': json.dumps({'region': 'us-west-2', 'instance_size': 'm1.medium'})}
+        body = {
+            'id': 'autotest',
+            'provider': 'autotest',
+            'params': json.dumps({'region': 'us-west-2', 'instance_size': 'm1.medium'}),
+            }
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
 
@@ -50,9 +53,13 @@ def test_build(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data['version'], 1)
         # post a new build
-        body = {'sha': uuid.uuid4().hex, 'slug_size': 4096000, 'procfile': json.dumps({'web': 'node server.js'}),
-                'url': 'http://deis.local/slugs/1c52739bbf3a44d3bfb9a58f7bbdd5fb.tar.gz',
-                'checksum': uuid.uuid4().hex}
+        body = {
+            'sha': uuid.uuid4().hex,
+            'slug_size': 4096000,
+            'procfile': json.dumps({'web': 'node server.js'}),
+            'url': 'http://deis.local/slugs/1c52739bbf3a44d3bfb9a58f7bbdd5fb.tar.gz',
+            'checksum': uuid.uuid4().hex,
+            }
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
         build1 = response.data
@@ -63,9 +70,13 @@ def test_build(self):
         build2 = response.data
         self.assertEqual(build1, build2)
         # post a new build
-        body = {'sha': uuid.uuid4().hex, 'slug_size': 4096000, 'procfile': json.dumps({'web': 'node server.js'}),
-                'url': 'http://deis.local/slugs/1c52739bbf3a44d3bfb9a58f7bbdd5fb.tar.gz',
-                'checksum': uuid.uuid4().hex}
+        body = {
+            'sha': uuid.uuid4().hex,
+            'slug_size': 4096000,
+            'procfile': json.dumps({'web': 'node server.js'}),
+            'url': 'http://deis.local/slugs/1c52739bbf3a44d3bfb9a58f7bbdd5fb.tar.gz',
+            'checksum': uuid.uuid4().hex,
+            }
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
         build3 = response.data

api/tests/container.py

@@ -92,100 +92,100 @@ def test_container_balance(self):
         self.assertEqual(response.status_code, 201)
         formation_id = response.data['id']
         # scale backends
-        url = '/api/formations/{formation_id}/backends'.format(**locals())
+        url = "/api/formations/{formation_id}/backends".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 0)
-        url = '/api/formations/{formation_id}/scale'.format(**locals())
+        url = "/api/formations/{formation_id}/scale".format(**locals())
         body = {'backends': 2}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
         # should start with zero
-        url = '/api/formations/{formation_id}/containers'.format(**locals())
+        url = "/api/formations/{formation_id}/containers".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 0)
         # scale up
-        url = '/api/formations/{formation_id}/scale'.format(**locals())
+        url = "/api/formations/{formation_id}/scale".format(**locals())
         body = {'web': 8, 'worker': 2}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
         # scale backends
-        url = '/api/formations/{formation_id}/scale'.format(**locals())
-        body = {'backends': 4 }
+        url = "/api/formations/{formation_id}/scale".format(**locals())
+        body = {'backends': 4}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
         # calculate the formation
-        url = '/api/formations/{formation_id}/calculate'.format(**locals())
+        url = "/api/formations/{formation_id}/calculate".format(**locals())
         response = self.client.post(url)
         containers = response.data['containers']
         # check balance of web types
         by_backend = {}
         for c in containers['web'].values():
             backend, port = c.split(':')
             by_backend.setdefault(backend, []).append(port)
-        b_min = min([ len(by_backend[b]) for b in by_backend.keys() ])
-        b_max = max([ len(by_backend[b]) for b in by_backend.keys() ])
+        b_min = min([len(by_backend[b]) for b in by_backend.keys()])
+        b_max = max([len(by_backend[b]) for b in by_backend.keys()])
         self.assertLess(b_max - b_min, 2)
         # check balance of worker types
         by_backend = {}
         for c in containers['worker'].values():
             backend, port = c.split(':')
             by_backend.setdefault(backend, []).append(port)
-        b_min = min([ len(by_backend[b]) for b in by_backend.keys() ])
-        b_max = max([ len(by_backend[b]) for b in by_backend.keys() ])
+        b_min = min([len(by_backend[b]) for b in by_backend.keys()])
+        b_max = max([len(by_backend[b]) for b in by_backend.keys()])
         self.assertLess(b_max - b_min, 2)
         # scale up more
-        url = '/api/formations/{formation_id}/scale'.format(**locals())
+        url = "/api/formations/{formation_id}/scale".format(**locals())
         body = {'web': 6, 'worker': 4}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
         # calculate the formation
-        url = '/api/formations/{formation_id}/calculate'.format(**locals())
+        url = "/api/formations/{formation_id}/calculate".format(**locals())
         response = self.client.post(url)
         containers = response.data['containers']
         # check balance of web types
         by_backend = {}
         for c in containers['web'].values():
             backend, port = c.split(':')
             by_backend.setdefault(backend, []).append(port)
-        b_min = min([ len(by_backend[b]) for b in by_backend.keys() ])
-        b_max = max([ len(by_backend[b]) for b in by_backend.keys() ])
+        b_min = min([len(by_backend[b]) for b in by_backend.keys()])
+        b_max = max([len(by_backend[b]) for b in by_backend.keys()])
         self.assertLess(b_max - b_min, 2)
         # check balance of worker types
         by_backend = {}
         for c in containers['worker'].values():
             backend, port = c.split(':')
             by_backend.setdefault(backend, []).append(port)
-        b_min = min([ len(by_backend[b]) for b in by_backend.keys() ])
-        b_max = max([ len(by_backend[b]) for b in by_backend.keys() ])
+        b_min = min([len(by_backend[b]) for b in by_backend.keys()])
+        b_max = max([len(by_backend[b]) for b in by_backend.keys()])
         self.assertLess(b_max - b_min, 2)
         # scale down
-        url = '/api/formations/{formation_id}/scale'.format(**locals())
+        url = "/api/formations/{formation_id}/scale".format(**locals())
         body = {'web': 2, 'worker': 2}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
-        url = '/api/formations/{formation_id}/containers'.format(**locals())
+        url = "/api/formations/{formation_id}/containers".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 4)
         # calculate the formation
-        url = '/api/formations/{formation_id}/calculate'.format(**locals())
+        url = "/api/formations/{formation_id}/calculate".format(**locals())
         response = self.client.post(url)
         containers = response.data['containers']
         # check balance of web types
         by_backend = {}
         for c in containers['web'].values():
             backend, port = c.split(':')
             by_backend.setdefault(backend, []).append(port)
-        b_min = min([ len(by_backend[b]) for b in by_backend.keys() ])
-        b_max = max([ len(by_backend[b]) for b in by_backend.keys() ])
+        b_min = min([len(by_backend[b]) for b in by_backend.keys()])
+        b_max = max([len(by_backend[b]) for b in by_backend.keys()])
         self.assertLess(b_max - b_min, 2)
         # check balance of worker types
         by_backend = {}
         for c in containers['worker'].values():
             backend, port = c.split(':')
             by_backend.setdefault(backend, []).append(port)
-        b_min = min([ len(by_backend[b]) for b in by_backend.keys() ])
-        b_max = max([ len(by_backend[b]) for b in by_backend.keys() ])
+        b_min = min([len(by_backend[b]) for b in by_backend.keys()])
+        b_max = max([len(by_backend[b]) for b in by_backend.keys()])
         self.assertLess(b_max - b_min, 2)

api/tests/flavor.py

@@ -40,11 +40,11 @@ def test_flavor(self):
         response = self.client.get('/api/flavors')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 1)
-        url = '/api/flavors/{flavor_id}'.format(**locals())
+        url = "/api/flavors/{flavor_id}".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         new_init = {'ssh_authorized_keys': ['ssh-rsa aaaaaaaaa']}
-        body = {'init': yaml.safe_dump(new_init) }
+        body = {'init': yaml.safe_dump(new_init)}
         response = self.client.patch(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(yaml.safe_load(response.data['init']), new_init)