Merge "Update #noqa for out 79 character"

install-guide/source/conf.py

@@ -74,7 +74,8 @@ release = '0.1'
 #   extracted from git log.
 #   bug_tag: Tag for categorizing the bug. Must be set manually.
 # These variables are passed to the logabug code via html_context.
-giturl = u'http://git.openstack.org/cgit/openstack/trove/tree/install-guide/source'  # noqa
+giturl = (u'http://git.openstack.org/cgit/openstack/trove/tree/'
+          'install-guide/source')
 git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
 gitsha = os.popen(git_cmd).read().strip('\n')
 html_context = {"gitsha": gitsha, "bug_tag": bug_tag,

trove/configuration/models.py

@@ -402,5 +402,6 @@ def persisted_models():
     return {
         'configurations': DBConfiguration,
         'configuration_parameters': DBConfigurationParameter,
-        'datastore_configuration_parameters': DBDatastoreConfigurationParameters,  # noqa
+        'datastore_configuration_parameters':
+        DBDatastoreConfigurationParameters,
     }