flake8

conf2reST.py

@@ -17,6 +17,7 @@
 __date__ = '2016-07-15'
 __updated__ = '2016-07-15'
 
+
 def main(argv=None):  # IGNORE:C0111
     """Parse arguments and launch conversion
     """
@@ -42,8 +43,8 @@
 
 USAGE
 ''' % (
-    program_shortdesc,
-    str(__date__),
+        program_shortdesc,
+        str(__date__),
     )
     # Argument parsing
     parser = argparse.ArgumentParser(
@@ -78,6 +79,7 @@
     basedir = os.path.dirname(sys.argv[0])
     conf2rst(basedir, nmspc.directory, nmspc.output)
 
+
 def conf2rst(basedir, directory, output=None):
     """
     :param basedir: directory with the odoo_versions.csv file
@@ -197,10 +199,10 @@
                 repository = rst[group][element].get('repository', '')
                 if repository.startswith('ssh://hg@bitbucket.org/'):
                     text = '`%s <%s/commits/%s>`__' % (
-                        version, 
+                        version,
                         repository.replace(
                             'ssh://hg@bitbucket.org/',
                             'https://bitbucket.org/'),
                         version)
                 elif repository.startswith('git@bitbucket.org:'):
                     text = '`%s <%s/commits/%s>`__' % (
@@ -201,10 +203,10 @@
                         repository.replace(
                             'ssh://hg@bitbucket.org/',
                             'https://bitbucket.org/'),
                         version)
                 elif repository.startswith('git@bitbucket.org:'):
                     text = '`%s <%s/commits/%s>`__' % (
-                        version, 
+                        version,
                         repository.replace(
                             'git@bitbucket.org:',
                             'https://bitbucket.org/').replace('.git', ''),
@@ -214,5 +216,6 @@
                 out.write("     - %s\n" % text)
             out.write("\n")
 
+
 if __name__ == '__main__':
     main()

docker_dev_start.py

@@ -339,7 +339,7 @@
     if odoo_type != 'odoo7':
         data_volume_name = '{}_data'.format(project_name)
         logging.debug('Using data volume %s', data_volume_name)
-        volume = getVolume(docker_client, data_volume_name)
+        createVolume(docker_client, data_volume_name)
         # make sure the permission in the volume are correct
         mount_opts = '{}:/mnt/data'.format(data_volume_name)
         # TODO replace by something cleaner if possible
@@ -357,7 +357,7 @@
     # additionnal_addons only in odoo < 11
     for extra_volume in ['additional_addons', 'var', 'data']:
         volume_name = '{}_opt_odoo_{}'.format(project_name, extra_volume)
-        # volume = getVolume(docker_client, volume_name)
+        # volume = createVolume(docker_client, volume_name)
         binds.append('{}:/opt/odoo/{}'.format(volume_name, extra_volume))
 
     if start_postgresql:
@@ -369,7 +369,7 @@
             postgresql_version, project_name)
 
         host_pg_port = 5433
-        # volume = getVolume(docker_client, pg_data_volume_name)
+        # volume = createVolume(docker_client, pg_data_volume_name)
         host_config = docker_client.create_host_config(
             binds=['{}:/var/lib/postgresql'.format(pg_data_volume_name)],
             port_bindings={5432: host_pg_port},
@@ -395,7 +395,7 @@
         try:
             if local_ip or start_postgresql:
                 port = host_pg_port if start_postgresql else None
-                _ = connect(
+                connect(
                     user=user,
                     password=password,
                     database='postgres',
@@ -403,7 +403,7 @@
                     port=port,
                 )
             else:
-                _ = connect(
+                connect(
                     user=user,
                     password=password,
                     database='postgres',
@@ -523,7 +523,8 @@
         logging.debug(' '.join(cmd))
         call(cmd)
 
-def getVolume(docker_client, data_volume_name):
+
+def createVolume(docker_client, data_volume_name):
     """Return the volume passed in parameter, creating it if it does not exists
     """
     volumes = docker_client.volumes(filters={'name': data_volume_name})
@@ -534,6 +535,7 @@
         logging.debug('Creating volume %s', data_volume_name)
         return docker_client.create_volume(name=data_volume_name)
 
+
 def isRunning(docker_client, container_id):
     """Return true if the container is still running
     """
@@ -537,7 +539,9 @@
 def isRunning(docker_client, container_id):
     """Return true if the container is still running
     """
-    return len(docker_client.containers(filters={'id': container_id}, quiet=True))
+    return len(docker_client.containers(
+        filters={'id': container_id}, quiet=True))
+
 
 if __name__ == "__main__":
     return_code = main()