Refs #6, flake8 code cleanup nearly done.

Author: mboersma

api/tests/__init__.py

@@ -27,14 +27,14 @@ def send_patch(self, path, data='', content_type='application/octet-stream',
 RequestFactory.patch = construct_patch
 Client.patch = send_patch
 
-from .auth import *
-from .backend import *
-from .build import *
-from .config import *
-from .container import *
-from .flavor import *
-from .formation import *
-from .node import *
-from .provider import *
-from .proxy import *
-from .release import *
+from .auth import *  # noqa
+from .backend import *  # noqa
+from .build import *  # noqa
+from .config import *  # noqa
+from .container import *  # noqa
+from .flavor import *  # noqa
+from .formation import *  # noqa
+from .node import *  # noqa
+from .provider import *  # noqa
+from .proxy import *  # noqa
+from .release import *  # noqa

api/tests/formation.py

@@ -58,7 +58,8 @@ def test_formation(self):
 
     def test_formation_auto_id(self):
         body = {'flavor': 'autotest', 'image': 'deis/autotest'}
-        response = self.client.post('/api/formations', json.dumps(body), content_type='application/json')
+        response = self.client.post(
+            '/api/formations', json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
         self.assertTrue(response.data['id'])
         return response
@@ -79,11 +80,13 @@ def test_formation_ssh_override(self):
     def test_formation_errors(self):
         # test duplicate id
         body = {'flavor': 'autotest', 'image': 'deis/autotest'}
-        response = self.client.post('/api/formations', json.dumps(body), content_type='application/json')
+        response = self.client.post(
+            '/api/formations', json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
         self.assertTrue(response.data['id'])
         body = {'id': response.data['id'], 'flavor': 'autotest', 'image': 'deis/autotest'}
-        response = self.client.post('/api/formations', json.dumps(body), content_type='application/json')
+        response = self.client.post(
+            '/api/formations', json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 400)
         self.assertEqual(json.loads(response.content), 'Formation with this Id already exists.')
 

api/views.py

@@ -179,7 +179,7 @@ def post_save(self, formation, created=False, **kwargs):
                 owner=formation.owner, formation=formation, values={})
             build = models.Build.objects.create(
                 owner=formation.owner, formation=formation)
-            _release = models.Release.objects.create(
+            models.Release.objects.create(
                 owner=formation.owner, formation=formation, config=config,
                 image=formation.image, build=build)
             # prepare the formation's required infrastruture at the provider

celerytasks/azuresms.py

@@ -12,17 +12,30 @@
 @task(name='azuresms.launch_node')
 def launch_node(node_id, creds, params, init, ssh_username, ssh_private_key):
     # install this manually in your virtual env https://github.com/WindowsAzure/azure-sdk-for-python
-    # http://scottdensmore.typepad.com/blog/2012/01/creating-a-ssl-certificate-for-the-cloud-ready-packages-for-the-ios-windows-azure-toolkit.html
+    # "pip install azure"
+    # http://scottdensmore.typepad.com/blog/2012/01/
+    # creating-a-ssl-certificate-for-the-cloud-ready-packages-for-the-ios-windows-azure-toolkit.html
     # I got all these weird "random" errors that didnt effect anything
-    sms = ServiceManagementService(subscription_id="69581868-8a08-4d98-a5b0-1d111c616fc3", cert_file="/Users/dgriffin/certs/iOSWAToolkit.pem")
+    sms = ServiceManagementService(
+        subscription_id='69581868-8a08-4d98-a5b0-1d111c616fc3',
+        cert_file='/Users/dgriffin/certs/iOSWAToolkit.pem')
     for i in sms.list_os_images():
-        print "I is ", i.name, " -- ", i.label, " -- ", i.location, " -- ", i.media_link
-    media_link = "http://opdemandstorage.blob.core.windows.net/communityimages/b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu_DAILY_BUILD-precise-12_04_2-LTS-amd64-server-20130702-en-us-30GB.vhd"
+        print 'I is ', i.name, ' -- ', i.label, ' -- ', i.location, ' -- ', i.media_link
+    media_link = \
+        'http://opdemandstorage.blob.core.windows.net/communityimages/' + \
+        'b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu_DAILY_BUILD-' + \
+        'precise-12_04_2-LTS-amd64-server-20130702-en-us-30GB.vhd'
     config = LinuxConfigurationSet(user_name="ubuntu", user_password="opdemand")
-    hard_disk = OSVirtualHardDisk('b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu_DAILY_BUILD-precise-12_04_2-LTS-amd64-server-20130702-en-us-30GB', media_link, disk_label='opdemandservice')
-    ret = sms.create_virtual_machine_deployment('opdemandservice', 'deploy1', "production", "opdemandservice2", "opdemandservice3", config, hard_disk)
-                                               #service_name, deployment_name, deployment_slot, label, role_name, system_config, os_virtual_hard_disk
-    print "Ret ", ret
+    hard_disk = OSVirtualHardDisk(
+        'b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu_DAILY_BUILD-' +
+        'precise-12_04_2-LTS-amd64-server-20130702-en-us-30GB',
+        media_link, disk_label='opdemandservice')
+    ret = sms.create_virtual_machine_deployment(
+        'opdemandservice', 'deploy1', 'production', 'opdemandservice2',
+        'opdemandservice3', config, hard_disk)
+       # service_name, deployment_name, deployment_slot, label, role_name
+       # system_config, os_virtual_hard_disk
+    print 'Ret ', ret
     return sms
 
 
@@ -49,7 +62,7 @@ def prepare_run_kwargs(params, init):
         'kernel_id': None, 'ramdisk_id': None,
         'monitoring_enabled': False, 'subnet_id': None,
         'block_device_map': None,
-    }
+        }
     # convert zone "any" to NoneType
     requested_zone = params.get('zone')
     if requested_zone and requested_zone.lower() == 'any':
@@ -61,7 +74,7 @@ def prepare_run_kwargs(params, init):
         'security_groups': params['security_groups'],
         'placement': requested_zone,
         'kernel_id': params.get('kernel', None),
-    }
+        }
     # update user_data
     cloud_config = '#cloud-config\n'+yaml.safe_dump(init)
     kwargs.update({'user_data': cloud_config})
@@ -74,8 +87,7 @@ def format_metadata(boto):
     return {
         'architecture': boto.architecture,
         'block_device_mapping': {
-            k: v.volume_id for k, v in boto.block_device_mapping.items()
-        },
+            k: v.volume_id for k, v in boto.block_device_mapping.items()},
         'client_token': boto.client_token,
         'dns_name': boto.dns_name,
         'ebs_optimized': boto.ebs_optimized,
@@ -118,5 +130,5 @@ def format_metadata(boto):
 
 
 if __name__ == "__main__":
-    print "Checking "
+    print 'Checking '
     l = launch_node(None, None, None, None, None, None)

celerytasks/chef_rsa.py

@@ -2,10 +2,20 @@
 This file as copied from pyChef at https://github.com/coderanger/pychef
 """
 
+from ctypes import CDLL
+from ctypes import byref
+from ctypes import c_char_p
+from ctypes import c_int
+from ctypes import c_long
+from ctypes import c_size_t
+from ctypes import c_ulong
+from ctypes import c_void_p
+from ctypes import create_string_buffer
+from ctypes import string_at
 import sys
-from ctypes import *
 
-if sys.platform == 'win32' or sys.platform == 'cygwin':
+
+if sys.platform in ('win32', 'cygwin'):
     _eay = CDLL('libeay32.dll')
 elif sys.platform == 'darwin':
     _eay = CDLL('libcrypto.dylib')

celerytasks/tests/__init__.py

@@ -1,2 +1,3 @@
-from chef import *
-from azuretest import *
+
+from azuretest import *  # noqa
+from chef import *  # noqa

deis/settings.py

@@ -250,9 +250,9 @@
 # EMAIL_HOST_PASSWORD = 'bar'
 
 # import other settings
-from .chef_settings import *  # @UnusedWildImport
-from .celery_settings import *  # @UnusedWildImport
+from .chef_settings import *  # noqa @UnusedWildImport
+from .celery_settings import *  # noqa @UnusedWildImport
 try:
-    from .local_settings import *  # pylint: disable=W0401 @UnusedWildImport
+    from .local_settings import *  # noqa @UnusedWildImport
 except ImportError:
-    pass
+    print('No deis/local_settings.py file found!')

requirements.txt

@@ -1,4 +1,4 @@
-azure>=0.7.0
+# Deis' python library requirements
 boto>=2.9.8
 Django>=1.5.1
 django-allauth>=0.12.0
@@ -13,3 +13,12 @@ psycopg2>=2.5.1
 pyCrypto>=2.6
 PyYAML>=3.10
 South>=0.8.1
+
+# Windows Azure cloud driver -- not yet required
+# azure>=0.7.0
+
+# Generates template documentation in the Django admin.
+# docutils>=0.11
+
+# Deis developers must run "flake8" before committing code.
+# flake8>=2.0