From ae228bb5cc724b647113fa2b5b92b13146190964 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 31 Mar 2020 17:18:42 +0200 Subject: [PATCH] Update hacking for Python3 The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Fix problems found. Update local hacking checks for new flake8. Remove hacking and friends from lower-constraints, those are not needed for co-installing. Change-Id: I926efaef501f190e78da9cab40c1e94203277258 --- lower-constraints.txt | 4 --- magnum/api/controllers/v1/cluster_template.py | 2 +- magnum/api/controllers/v1/types.py | 2 +- magnum/api/middleware/auth_token.py | 2 +- .../common/cert_manager/local_cert_manager.py | 2 +- magnum/common/exception.py | 2 +- magnum/common/short_id.py | 3 ++- .../conductor/handlers/common/cert_manager.py | 16 +++++------ .../041d9a0f1159_add_flavor_id_to_cluster.py | 4 +-- ...remove_ssh_authorized_key_from_baymodel.py | 2 +- ...5aa95ba_change_storage_driver_to_string.py | 4 +-- .../05d3e97de9ee_add_volume_driver.py | 8 +++--- .../versions/085e601a39f6_remove_service.py | 2 +- .../14328d6a57e3_add_master_count_to_bay.py | 4 +-- ...0dd_add_labels_column_to_baymodel_table.py | 4 +-- .../156ceb17fb0a_add_bay_status_reason.py | 4 +-- .../1afee1db6cd0_add_master_flavor.py | 4 +-- .../1c1ff5e56048_rename_container_image_id.py | 4 +-- ...1d045384b966_add_insecure_baymodel_attr.py | 4 +-- .../versions/1f196a3dabae_remove_container.py | 2 +- .../2581ebaf0cb2_initial_migration.py | 8 +++--- ...4e2_adding_magnum_service_functionality.py | 4 +-- .../29affeaa2bc2_rename_bay_master_address.py | 4 +-- .../2ace4006498_rename_bay_minions_address.py | 4 +-- ...191_add_public_column_to_baymodel_table.py | 4 +-- .../2b5f24dd95de_rename_service_port.py | 4 +-- .../2d1354bbf76e_ssh_authorized_key.py | 4 +-- .../versions/2d8657c0cdc_add_bay_uuid.py | 4 +-- .../33ef79969018_add_memory_to_container.py | 4 +-- ...7c86221_add_private_network_to_baymodel.py | 8 +++--- .../3a938526b35d_add_docker_volume_size.py | 4 +-- .../3b6c4c42adb4_add_unique_constraints.py | 2 +- ...a94a_add_network_driver_baymodel_column.py | 8 +++--- .../versions/3bea56f25597_multi_tenant.py | 4 +-- ...325033343_add_bay_create_timeout_to_bay.py | 4 +-- ...17917e778f5_add_server_type_to_baymodel.py | 4 +-- .../421102d1f2d2_create_x509keypair_table.py | 4 +-- .../456126c6c9e9_create_baylock_table.py | 4 +-- ...c7_change_cluster_to_support_nodegroups.py | 12 ++++----- ...4133d_add_network_subnet_fip_to_cluster.py | 8 +++--- .../4956f03cabad_add_cluster_distro.py | 8 +++--- .../4e263f236334_add_registry_enabled.py | 4 +-- .../4ea34a59a64c_add_discovery_url_to_bay.py | 8 +++--- ...f58fecb_add_master_flavor_id_to_cluster.py | 4 +-- .../53882537ac57_add_host_column_to_pod.py | 4 +-- .../versions/5518af8dbc21_rename_cert_uuid.py | 8 +++--- .../versions/5793cd26898d_add_bay_status.py | 4 +-- .../versions/57fbdf2327a2_remove_baylock.py | 2 +- ...592131657ca1_add_coe_column_to_baymodel.py | 10 +++---- .../5977879072a7_add_env_to_container.py | 4 +-- .../59e7664a8ba1_add_container_status.py | 4 +-- .../versions/5ad410481b88_rename_insecure.py | 4 +-- ...d4caa6e0a42_create_trustee_for_each_bay.py | 8 +++--- ...ter_lb_enabled_column_to_baymodel_table.py | 4 +-- .../6f21dc920bb_add_cert_uuid_to_bay.py | 4 +-- ...6f21dc998bb_add_master_addresses_to_bay.py | 6 ++--- ...20f640f43d1_rename_bay_table_to_cluster.py | 4 +-- ...fb45df249_remove_replication_controller.py | 2 +- ...2e3c7abc_add_hidden_to_cluster_template.py | 4 +-- .../alembic/versions/966a99e70ff_add_proxy.py | 8 +++--- .../9a1539f1cd2c_add_federation_table.py | 6 ++--- .../a0e7c8450ab1_add_labels_to_cluster.py | 4 +-- ...335540_add_docker_storage_driver_column.py | 4 +-- ...839af_add_docker_volume_size_to_cluster.py | 4 +-- .../ac92cbae311c_add_nodegoup_table.py | 8 +++--- ...dc3b7679ae_add_registry_trust_id_to_bay.py | 4 +-- ...8cab_add_floating_ip_enabled_column_to_.py | 4 +-- .../bb42b7cad130_remove_node_object.py | 2 +- .../bc46ba6cf949_add_keypair_to_cluster.py | 4 +-- .../versions/c04e925e65c2_nodegroups_v2.py | 6 ++--- ...bc65a86986_add_health_status_to_cluster.py | 4 +-- .../d072f58ab240_modify_x509keypair_table.py | 4 +-- ...d_fixed_subnet_column_to_baymodel_table.py | 8 +++--- ...31da8_add_insecure_registry_to_baymodel.py | 8 +++--- .../e772b2598d9_add_container_command.py | 4 +-- .../ee92b41b8809_create_quotas_table.py | 4 +-- .../versions/ef08a5e057bd_remove_pod.py | 2 +- ...8919_rename_baymodel_to_clustertemplate.py | 2 +- .../fcb4efee8f8b_add_version_info_to_bay.py | 8 +++--- magnum/db/sqlalchemy/models.py | 1 + magnum/drivers/heat/driver.py | 2 +- magnum/hacking/checks.py | 27 +++++++++---------- .../unit/api/controllers/v1/test_baymodel.py | 2 +- .../handlers/test_k8s_cluster_conductor.py | 2 -- magnum/tests/unit/service/test_periodic.py | 1 + magnum/tests/unit/test_hacking.py | 8 +++--- test-requirements.txt | 2 +- tox.ini | 14 ++++++++-- 88 files changed, 219 insertions(+), 215 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 99e3f7e628..e17350a6ea 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -32,14 +32,12 @@ eventlet==0.18.2 extras==1.0.0 fasteners==0.14.1 fixtures==3.0.0 -flake8==2.5.5 future==0.16.0 futurist==1.6.0 gitdb2==2.0.3 GitPython==2.1.8 google-auth==1.4.1 greenlet==0.4.13 -hacking==0.12.0 idna==2.6 imagesize==1.0.0 ipaddress==1.0.19 @@ -98,7 +96,6 @@ Paste==2.0.3 PasteDeploy==1.5.2 pbr==2.0.0 pecan==1.0.0 -pep8==1.5.7 pika-pool==0.1.3 pika==0.10.0 prettytable==0.7.2 @@ -107,7 +104,6 @@ pyasn1-modules==0.2.1 pyasn1==0.4.2 pycadf==1.1.0 pycparser==2.18 -pyflakes==0.8.1 Pygments==2.2.0 pyinotify==0.9.6 pyOpenSSL==17.5.0 diff --git a/magnum/api/controllers/v1/cluster_template.py b/magnum/api/controllers/v1/cluster_template.py index 08f104c5e2..843bd23fa5 100644 --- a/magnum/api/controllers/v1/cluster_template.py +++ b/magnum/api/controllers/v1/cluster_template.py @@ -414,7 +414,7 @@ class ClusterTemplatesController(base.Controller): new_cluster_template.uuid) return ClusterTemplate.convert_with_links(new_cluster_template) - @wsme.validate(types.uuid_or_name, [ClusterTemplatePatchType]) + @wsme.validate(types.uuid_or_name, [ClusterTemplatePatchType]) # noqa @expose.expose(ClusterTemplate, types.uuid_or_name, body=[ClusterTemplatePatchType]) @validation.enforce_network_driver_types_update() diff --git a/magnum/api/controllers/v1/types.py b/magnum/api/controllers/v1/types.py index a80f26a8e5..ad0a99e587 100644 --- a/magnum/api/controllers/v1/types.py +++ b/magnum/api/controllers/v1/types.py @@ -152,7 +152,7 @@ boolean = BooleanType() class JsonPatchType(wtypes.Base): """A complex type that represents a single json-patch operation.""" - path = wtypes.wsattr(wtypes.StringType(pattern='^(/[\w-]+)+$'), + path = wtypes.wsattr(wtypes.StringType(pattern=r'^(/[\w-]+)+$'), mandatory=True) op = wtypes.wsattr(wtypes.Enum(wtypes.text, 'add', 'replace', 'remove'), mandatory=True) diff --git a/magnum/api/middleware/auth_token.py b/magnum/api/middleware/auth_token.py index 788eb0b1b6..7b23e86813 100644 --- a/magnum/api/middleware/auth_token.py +++ b/magnum/api/middleware/auth_token.py @@ -32,7 +32,7 @@ class AuthTokenMiddleware(auth_token.AuthProtocol): def __init__(self, app, conf, public_api_routes=None): if public_api_routes is None: public_api_routes = [] - route_pattern_tpl = '%s(\.json)?$' + route_pattern_tpl = r'%s(\.json)?$' try: self.public_api_routes = [re.compile(route_pattern_tpl % route_tpl) diff --git a/magnum/common/cert_manager/local_cert_manager.py b/magnum/common/cert_manager/local_cert_manager.py index 2e859ab305..6ae82b34ad 100644 --- a/magnum/common/cert_manager/local_cert_manager.py +++ b/magnum/common/cert_manager/local_cert_manager.py @@ -103,7 +103,7 @@ class CertManager(cert_manager.CertManager): return cert_ref - @staticmethod + @staticmethod # noqa: C901 def get_cert(cert_ref, **kwargs): """Retrieves the specified cert. diff --git a/magnum/common/exception.py b/magnum/common/exception.py index d9467fc855..309a070c52 100755 --- a/magnum/common/exception.py +++ b/magnum/common/exception.py @@ -37,7 +37,7 @@ CONF = magnum.conf.CONF try: CONF.import_opt('fatal_exception_format_errors', 'oslo_versionedobjects.exception') -except cfg.NoSuchOptError as e: +except cfg.NoSuchOptError: # Note:work around for magnum run against master branch # in devstack gate job, as magnum not branched yet # verisonobjects kilo/master different version can diff --git a/magnum/common/short_id.py b/magnum/common/short_id.py index 1568259baa..5d0e9526ad 100644 --- a/magnum/common/short_id.py +++ b/magnum/common/short_id.py @@ -31,7 +31,8 @@ def _to_byte_string(value, num_bits): required. """ shifts = six.moves.xrange(num_bits - 8, -8, -8) - byte_at = lambda off: (value >> off if off >= 0 else value << -off) & 0xff + byte_at = lambda off: ((value >> off # noqa: E731 + if off >= 0 else value << -off) & 0xff) return ''.join(chr(byte_at(offset)) for offset in shifts) diff --git a/magnum/conductor/handlers/common/cert_manager.py b/magnum/conductor/handlers/common/cert_manager.py index 6dca138e6f..4acbd1b014 100755 --- a/magnum/conductor/handlers/common/cert_manager.py +++ b/magnum/conductor/handlers/common/cert_manager.py @@ -233,11 +233,11 @@ def delete_certificates_from_cluster(cluster, context=None): def delete_client_files(cluster, context=None): - cached_cert_dir = os.path.join(CONF.cluster.temp_cache_dir, - cluster.uuid) - try: - if os.path.isdir(cached_cert_dir): - shutil.rmtree(cached_cert_dir) - except Exception: - LOG.warning("Deleting client files failed for Cluster %s", - cluster.uuid) + cached_cert_dir = os.path.join(CONF.cluster.temp_cache_dir, + cluster.uuid) + try: + if os.path.isdir(cached_cert_dir): + shutil.rmtree(cached_cert_dir) + except Exception: + LOG.warning("Deleting client files failed for Cluster %s", + cluster.uuid) diff --git a/magnum/db/sqlalchemy/alembic/versions/041d9a0f1159_add_flavor_id_to_cluster.py b/magnum/db/sqlalchemy/alembic/versions/041d9a0f1159_add_flavor_id_to_cluster.py index 478671c1f2..5fe261ca8c 100644 --- a/magnum/db/sqlalchemy/alembic/versions/041d9a0f1159_add_flavor_id_to_cluster.py +++ b/magnum/db/sqlalchemy/alembic/versions/041d9a0f1159_add_flavor_id_to_cluster.py @@ -21,8 +21,8 @@ Create Date: 2017-07-31 12:46:00.777841 revision = '041d9a0f1159' down_revision = '04c625aa95ba' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/049f81f6f584_remove_ssh_authorized_key_from_baymodel.py b/magnum/db/sqlalchemy/alembic/versions/049f81f6f584_remove_ssh_authorized_key_from_baymodel.py index 793b303eaf..75031bddd2 100644 --- a/magnum/db/sqlalchemy/alembic/versions/049f81f6f584_remove_ssh_authorized_key_from_baymodel.py +++ b/magnum/db/sqlalchemy/alembic/versions/049f81f6f584_remove_ssh_authorized_key_from_baymodel.py @@ -25,7 +25,7 @@ Create Date: 2016-02-28 15:27:26.211244 revision = '049f81f6f584' down_revision = 'ee92b41b8809' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/04c625aa95ba_change_storage_driver_to_string.py b/magnum/db/sqlalchemy/alembic/versions/04c625aa95ba_change_storage_driver_to_string.py index 4a53f32579..8d3203e0d9 100644 --- a/magnum/db/sqlalchemy/alembic/versions/04c625aa95ba_change_storage_driver_to_string.py +++ b/magnum/db/sqlalchemy/alembic/versions/04c625aa95ba_change_storage_driver_to_string.py @@ -21,8 +21,8 @@ Create Date: 2017-10-10 15:40:37.553288 revision = '04c625aa95ba' down_revision = '52bcaf58fecb' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/05d3e97de9ee_add_volume_driver.py b/magnum/db/sqlalchemy/alembic/versions/05d3e97de9ee_add_volume_driver.py index 74461a5639..a0c123f231 100644 --- a/magnum/db/sqlalchemy/alembic/versions/05d3e97de9ee_add_volume_driver.py +++ b/magnum/db/sqlalchemy/alembic/versions/05d3e97de9ee_add_volume_driver.py @@ -22,13 +22,13 @@ Create Date: 2016-01-12 06:21:24.880838 revision = '05d3e97de9ee' down_revision = '57fbdf2327a2' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/085e601a39f6_remove_service.py b/magnum/db/sqlalchemy/alembic/versions/085e601a39f6_remove_service.py index fee6c0c21c..ba526311ef 100644 --- a/magnum/db/sqlalchemy/alembic/versions/085e601a39f6_remove_service.py +++ b/magnum/db/sqlalchemy/alembic/versions/085e601a39f6_remove_service.py @@ -21,7 +21,7 @@ Create Date: 2016-05-25 12:05:30.790282 revision = '085e601a39f6' down_revision = 'a1136d335540' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/14328d6a57e3_add_master_count_to_bay.py b/magnum/db/sqlalchemy/alembic/versions/14328d6a57e3_add_master_count_to_bay.py index d2edb4bb9b..81935733b7 100644 --- a/magnum/db/sqlalchemy/alembic/versions/14328d6a57e3_add_master_count_to_bay.py +++ b/magnum/db/sqlalchemy/alembic/versions/14328d6a57e3_add_master_count_to_bay.py @@ -23,8 +23,8 @@ Create Date: 2015-07-29 16:00:38.721016 revision = '14328d6a57e3' down_revision = '53882537ac57' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/1481f5b560dd_add_labels_column_to_baymodel_table.py b/magnum/db/sqlalchemy/alembic/versions/1481f5b560dd_add_labels_column_to_baymodel_table.py index 681393d781..dec66e9d8a 100644 --- a/magnum/db/sqlalchemy/alembic/versions/1481f5b560dd_add_labels_column_to_baymodel_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/1481f5b560dd_add_labels_column_to_baymodel_table.py @@ -21,8 +21,8 @@ Create Date: 2015-09-02 22:34:07.590142 revision = '1481f5b560dd' down_revision = '3be65537a94a' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/156ceb17fb0a_add_bay_status_reason.py b/magnum/db/sqlalchemy/alembic/versions/156ceb17fb0a_add_bay_status_reason.py index 75310cb4c2..2d8ca7470f 100644 --- a/magnum/db/sqlalchemy/alembic/versions/156ceb17fb0a_add_bay_status_reason.py +++ b/magnum/db/sqlalchemy/alembic/versions/156ceb17fb0a_add_bay_status_reason.py @@ -21,8 +21,8 @@ Create Date: 2015-05-30 11:34:57.847071 revision = '156ceb17fb0a' down_revision = '59e7664a8ba1' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/1afee1db6cd0_add_master_flavor.py b/magnum/db/sqlalchemy/alembic/versions/1afee1db6cd0_add_master_flavor.py index a521f0ae9e..6c01f227b1 100644 --- a/magnum/db/sqlalchemy/alembic/versions/1afee1db6cd0_add_master_flavor.py +++ b/magnum/db/sqlalchemy/alembic/versions/1afee1db6cd0_add_master_flavor.py @@ -21,8 +21,8 @@ Create Date: 2015-02-27 14:53:38.042900 revision = '1afee1db6cd0' down_revision = '35cff7c86221' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/1c1ff5e56048_rename_container_image_id.py b/magnum/db/sqlalchemy/alembic/versions/1c1ff5e56048_rename_container_image_id.py index d7113afc45..a860ffaf65 100644 --- a/magnum/db/sqlalchemy/alembic/versions/1c1ff5e56048_rename_container_image_id.py +++ b/magnum/db/sqlalchemy/alembic/versions/1c1ff5e56048_rename_container_image_id.py @@ -21,8 +21,8 @@ Create Date: 2015-06-18 10:21:40.991734 revision = '1c1ff5e56048' down_revision = '156ceb17fb0a' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/1d045384b966_add_insecure_baymodel_attr.py b/magnum/db/sqlalchemy/alembic/versions/1d045384b966_add_insecure_baymodel_attr.py index c971bfaca8..87b8308109 100644 --- a/magnum/db/sqlalchemy/alembic/versions/1d045384b966_add_insecure_baymodel_attr.py +++ b/magnum/db/sqlalchemy/alembic/versions/1d045384b966_add_insecure_baymodel_attr.py @@ -21,8 +21,8 @@ Create Date: 2015-09-23 18:17:10.195121 revision = '1d045384b966' down_revision = '1481f5b560dd' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/1f196a3dabae_remove_container.py b/magnum/db/sqlalchemy/alembic/versions/1f196a3dabae_remove_container.py index 15413814dd..78803bae64 100644 --- a/magnum/db/sqlalchemy/alembic/versions/1f196a3dabae_remove_container.py +++ b/magnum/db/sqlalchemy/alembic/versions/1f196a3dabae_remove_container.py @@ -21,7 +21,7 @@ Create Date: 2016-06-02 11:42:42.200992 revision = '1f196a3dabae' down_revision = 'e0653b2d5271' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/2581ebaf0cb2_initial_migration.py b/magnum/db/sqlalchemy/alembic/versions/2581ebaf0cb2_initial_migration.py index 29e0a84e45..c20d65ac89 100644 --- a/magnum/db/sqlalchemy/alembic/versions/2581ebaf0cb2_initial_migration.py +++ b/magnum/db/sqlalchemy/alembic/versions/2581ebaf0cb2_initial_migration.py @@ -23,13 +23,13 @@ Create Date: 2014-01-17 12:14:07.754448 revision = '2581ebaf0cb2' down_revision = None -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/27ad304554e2_adding_magnum_service_functionality.py b/magnum/db/sqlalchemy/alembic/versions/27ad304554e2_adding_magnum_service_functionality.py index 401d454ea5..1e8e50887a 100644 --- a/magnum/db/sqlalchemy/alembic/versions/27ad304554e2_adding_magnum_service_functionality.py +++ b/magnum/db/sqlalchemy/alembic/versions/27ad304554e2_adding_magnum_service_functionality.py @@ -22,8 +22,8 @@ Create Date: 2015-09-01 18:27:14.371860 revision = '27ad304554e2' down_revision = '1d045384b966' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/29affeaa2bc2_rename_bay_master_address.py b/magnum/db/sqlalchemy/alembic/versions/29affeaa2bc2_rename_bay_master_address.py index 219c37e768..ee4fcda445 100644 --- a/magnum/db/sqlalchemy/alembic/versions/29affeaa2bc2_rename_bay_master_address.py +++ b/magnum/db/sqlalchemy/alembic/versions/29affeaa2bc2_rename_bay_master_address.py @@ -21,8 +21,8 @@ Create Date: 2015-03-25 16:06:08.148629 revision = '29affeaa2bc2' down_revision = '2d1354bbf76e' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/2ace4006498_rename_bay_minions_address.py b/magnum/db/sqlalchemy/alembic/versions/2ace4006498_rename_bay_minions_address.py index c9d1fefabd..f7933beb7e 100644 --- a/magnum/db/sqlalchemy/alembic/versions/2ace4006498_rename_bay_minions_address.py +++ b/magnum/db/sqlalchemy/alembic/versions/2ace4006498_rename_bay_minions_address.py @@ -21,9 +21,9 @@ Create Date: 2015-03-27 15:15:36.309601 revision = '2ace4006498' down_revision = '29affeaa2bc2' -from alembic import op +from alembic import op # noqa: E402 -from magnum.db.sqlalchemy import models +from magnum.db.sqlalchemy import models # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/2ae93c9c6191_add_public_column_to_baymodel_table.py b/magnum/db/sqlalchemy/alembic/versions/2ae93c9c6191_add_public_column_to_baymodel_table.py index 1de4ade254..14054fa124 100644 --- a/magnum/db/sqlalchemy/alembic/versions/2ae93c9c6191_add_public_column_to_baymodel_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/2ae93c9c6191_add_public_column_to_baymodel_table.py @@ -24,8 +24,8 @@ Create Date: 2015-09-30 15:33:44.514290 revision = '2ae93c9c6191' down_revision = '5ad410481b88' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/2b5f24dd95de_rename_service_port.py b/magnum/db/sqlalchemy/alembic/versions/2b5f24dd95de_rename_service_port.py index a43d825827..d27c512415 100644 --- a/magnum/db/sqlalchemy/alembic/versions/2b5f24dd95de_rename_service_port.py +++ b/magnum/db/sqlalchemy/alembic/versions/2b5f24dd95de_rename_service_port.py @@ -21,9 +21,9 @@ Create Date: 2015-04-29 05:52:52.204095 revision = '2b5f24dd95de' down_revision = '3b6c4c42adb4' -from alembic import op +from alembic import op # noqa: E402 -from magnum.db.sqlalchemy import models +from magnum.db.sqlalchemy import models # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/2d1354bbf76e_ssh_authorized_key.py b/magnum/db/sqlalchemy/alembic/versions/2d1354bbf76e_ssh_authorized_key.py index c137d0ecfa..6e1b1dcdda 100644 --- a/magnum/db/sqlalchemy/alembic/versions/2d1354bbf76e_ssh_authorized_key.py +++ b/magnum/db/sqlalchemy/alembic/versions/2d1354bbf76e_ssh_authorized_key.py @@ -25,8 +25,8 @@ Create Date: 2015-03-13 14:05:58.744652 revision = '2d1354bbf76e' down_revision = '1afee1db6cd0' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/2d8657c0cdc_add_bay_uuid.py b/magnum/db/sqlalchemy/alembic/versions/2d8657c0cdc_add_bay_uuid.py index 0fd35d7362..fe2c4c0852 100644 --- a/magnum/db/sqlalchemy/alembic/versions/2d8657c0cdc_add_bay_uuid.py +++ b/magnum/db/sqlalchemy/alembic/versions/2d8657c0cdc_add_bay_uuid.py @@ -22,8 +22,8 @@ Create Date: 2015-04-22 16:59:06.799384 revision = '2d8657c0cdc' down_revision = 'e772b2598d9' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/33ef79969018_add_memory_to_container.py b/magnum/db/sqlalchemy/alembic/versions/33ef79969018_add_memory_to_container.py index e955f7ff46..e4676845f0 100644 --- a/magnum/db/sqlalchemy/alembic/versions/33ef79969018_add_memory_to_container.py +++ b/magnum/db/sqlalchemy/alembic/versions/33ef79969018_add_memory_to_container.py @@ -24,8 +24,8 @@ Create Date: 2015-10-03 17:03:47.194253 revision = '33ef79969018' down_revision = '2ae93c9c6191' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/35cff7c86221_add_private_network_to_baymodel.py b/magnum/db/sqlalchemy/alembic/versions/35cff7c86221_add_private_network_to_baymodel.py index 6cb787d818..ad3652fcdd 100644 --- a/magnum/db/sqlalchemy/alembic/versions/35cff7c86221_add_private_network_to_baymodel.py +++ b/magnum/db/sqlalchemy/alembic/versions/35cff7c86221_add_private_network_to_baymodel.py @@ -23,13 +23,13 @@ Create Date: 2015-02-26 05:02:34.260099 revision = '35cff7c86221' down_revision = '3a938526b35d' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/3a938526b35d_add_docker_volume_size.py b/magnum/db/sqlalchemy/alembic/versions/3a938526b35d_add_docker_volume_size.py index 2f6837e847..954a3875e2 100644 --- a/magnum/db/sqlalchemy/alembic/versions/3a938526b35d_add_docker_volume_size.py +++ b/magnum/db/sqlalchemy/alembic/versions/3a938526b35d_add_docker_volume_size.py @@ -25,8 +25,8 @@ Create Date: 2015-02-23 14:32:00.086650 revision = '3a938526b35d' down_revision = '5793cd26898d' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/3b6c4c42adb4_add_unique_constraints.py b/magnum/db/sqlalchemy/alembic/versions/3b6c4c42adb4_add_unique_constraints.py index 7be0f37093..097b7ed2ce 100644 --- a/magnum/db/sqlalchemy/alembic/versions/3b6c4c42adb4_add_unique_constraints.py +++ b/magnum/db/sqlalchemy/alembic/versions/3b6c4c42adb4_add_unique_constraints.py @@ -22,7 +22,7 @@ Create Date: 2015-05-05 09:45:44.657047 revision = '3b6c4c42adb4' down_revision = '592131657ca1' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/3be65537a94a_add_network_driver_baymodel_column.py b/magnum/db/sqlalchemy/alembic/versions/3be65537a94a_add_network_driver_baymodel_column.py index 8475412056..07f55a7296 100644 --- a/magnum/db/sqlalchemy/alembic/versions/3be65537a94a_add_network_driver_baymodel_column.py +++ b/magnum/db/sqlalchemy/alembic/versions/3be65537a94a_add_network_driver_baymodel_column.py @@ -25,13 +25,13 @@ Create Date: 2015-09-03 20:51:54.229436 revision = '3be65537a94a' down_revision = '4e263f236334' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/3bea56f25597_multi_tenant.py b/magnum/db/sqlalchemy/alembic/versions/3bea56f25597_multi_tenant.py index 754aa2ec44..9d32d88352 100644 --- a/magnum/db/sqlalchemy/alembic/versions/3bea56f25597_multi_tenant.py +++ b/magnum/db/sqlalchemy/alembic/versions/3bea56f25597_multi_tenant.py @@ -22,8 +22,8 @@ Create Date: 2015-01-22 22:22:22.150632 revision = '3bea56f25597' down_revision = '2581ebaf0cb2' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/40f325033343_add_bay_create_timeout_to_bay.py b/magnum/db/sqlalchemy/alembic/versions/40f325033343_add_bay_create_timeout_to_bay.py index ba080360d9..60b0a486ca 100644 --- a/magnum/db/sqlalchemy/alembic/versions/40f325033343_add_bay_create_timeout_to_bay.py +++ b/magnum/db/sqlalchemy/alembic/versions/40f325033343_add_bay_create_timeout_to_bay.py @@ -22,8 +22,8 @@ Create Date: 2015-12-02 16:38:54.697413 revision = '40f325033343' down_revision = '5977879072a7' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/417917e778f5_add_server_type_to_baymodel.py b/magnum/db/sqlalchemy/alembic/versions/417917e778f5_add_server_type_to_baymodel.py index 38ab38787f..ec8fb06778 100644 --- a/magnum/db/sqlalchemy/alembic/versions/417917e778f5_add_server_type_to_baymodel.py +++ b/magnum/db/sqlalchemy/alembic/versions/417917e778f5_add_server_type_to_baymodel.py @@ -22,8 +22,8 @@ Create Date: 2015-10-14 16:21:57.229436 revision = '417917e778f5' down_revision = '33ef79969018' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/421102d1f2d2_create_x509keypair_table.py b/magnum/db/sqlalchemy/alembic/versions/421102d1f2d2_create_x509keypair_table.py index e21e9367c2..ebf781deb7 100644 --- a/magnum/db/sqlalchemy/alembic/versions/421102d1f2d2_create_x509keypair_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/421102d1f2d2_create_x509keypair_table.py @@ -24,8 +24,8 @@ Create Date: 2015-07-17 13:12:12.653241 revision = '421102d1f2d2' down_revision = '14328d6a57e3' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/456126c6c9e9_create_baylock_table.py b/magnum/db/sqlalchemy/alembic/versions/456126c6c9e9_create_baylock_table.py index 37c26a5017..e7512f023e 100644 --- a/magnum/db/sqlalchemy/alembic/versions/456126c6c9e9_create_baylock_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/456126c6c9e9_create_baylock_table.py @@ -22,8 +22,8 @@ Create Date: 2015-04-01 15:04:45.652672 revision = '456126c6c9e9' down_revision = '2ace4006498' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/461d798132c7_change_cluster_to_support_nodegroups.py b/magnum/db/sqlalchemy/alembic/versions/461d798132c7_change_cluster_to_support_nodegroups.py index 40dfaa8338..e6920319a7 100644 --- a/magnum/db/sqlalchemy/alembic/versions/461d798132c7_change_cluster_to_support_nodegroups.py +++ b/magnum/db/sqlalchemy/alembic/versions/461d798132c7_change_cluster_to_support_nodegroups.py @@ -25,15 +25,15 @@ Create Date: 2019-02-06 14:32:40.316528 revision = '461d798132c7' down_revision = 'ac92cbae311c' -from alembic import op +from alembic import op # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from oslo_db.sqlalchemy.types import String -from oslo_serialization import jsonutils -from oslo_utils import uuidutils +from oslo_db.sqlalchemy.types import String # noqa: E402 +from oslo_serialization import jsonutils # noqa: E402 +from oslo_utils import uuidutils # noqa: E402 -from magnum.db.sqlalchemy import models +from magnum.db.sqlalchemy import models # noqa: E402 def _handle_json_columns(value, default=None): diff --git a/magnum/db/sqlalchemy/alembic/versions/47380964133d_add_network_subnet_fip_to_cluster.py b/magnum/db/sqlalchemy/alembic/versions/47380964133d_add_network_subnet_fip_to_cluster.py index 5e4a3c4067..42db8f0db7 100644 --- a/magnum/db/sqlalchemy/alembic/versions/47380964133d_add_network_subnet_fip_to_cluster.py +++ b/magnum/db/sqlalchemy/alembic/versions/47380964133d_add_network_subnet_fip_to_cluster.py @@ -22,10 +22,10 @@ Create Date: 2019-07-17 13:17:58.760452 revision = '47380964133d' down_revision = '461d798132c7' -from alembic import op -from oslo_db.sqlalchemy.types import String -import sqlalchemy as sa -from sqlalchemy.dialects.mysql import TINYTEXT +from alembic import op # noqa: E402 +from oslo_db.sqlalchemy.types import String # noqa: E402 +import sqlalchemy as sa # noqa: E402 +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/4956f03cabad_add_cluster_distro.py b/magnum/db/sqlalchemy/alembic/versions/4956f03cabad_add_cluster_distro.py index 1459384495..9ba8214973 100644 --- a/magnum/db/sqlalchemy/alembic/versions/4956f03cabad_add_cluster_distro.py +++ b/magnum/db/sqlalchemy/alembic/versions/4956f03cabad_add_cluster_distro.py @@ -22,13 +22,13 @@ Create Date: 2015-04-25 02:17:51.486547 revision = '4956f03cabad' down_revision = '2d8657c0cdc' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/4e263f236334_add_registry_enabled.py b/magnum/db/sqlalchemy/alembic/versions/4e263f236334_add_registry_enabled.py index a3c508cbb0..19882e29c4 100644 --- a/magnum/db/sqlalchemy/alembic/versions/4e263f236334_add_registry_enabled.py +++ b/magnum/db/sqlalchemy/alembic/versions/4e263f236334_add_registry_enabled.py @@ -21,8 +21,8 @@ Create Date: 2015-09-14 18:39:25.871218 revision = '4e263f236334' down_revision = '5518af8dbc21' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/4ea34a59a64c_add_discovery_url_to_bay.py b/magnum/db/sqlalchemy/alembic/versions/4ea34a59a64c_add_discovery_url_to_bay.py index 59badfaf8d..87007a43c2 100644 --- a/magnum/db/sqlalchemy/alembic/versions/4ea34a59a64c_add_discovery_url_to_bay.py +++ b/magnum/db/sqlalchemy/alembic/versions/4ea34a59a64c_add_discovery_url_to_bay.py @@ -21,13 +21,13 @@ Create Date: 2015-04-14 18:56:03.440329 revision = '4ea34a59a64c' down_revision = '456126c6c9e9' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/52bcaf58fecb_add_master_flavor_id_to_cluster.py b/magnum/db/sqlalchemy/alembic/versions/52bcaf58fecb_add_master_flavor_id_to_cluster.py index fd87195c39..d00e00ab5f 100644 --- a/magnum/db/sqlalchemy/alembic/versions/52bcaf58fecb_add_master_flavor_id_to_cluster.py +++ b/magnum/db/sqlalchemy/alembic/versions/52bcaf58fecb_add_master_flavor_id_to_cluster.py @@ -21,8 +21,8 @@ Create Date: 2017-08-01 11:22:31.277745 revision = '52bcaf58fecb' down_revision = 'a0e7c8450ab1' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/53882537ac57_add_host_column_to_pod.py b/magnum/db/sqlalchemy/alembic/versions/53882537ac57_add_host_column_to_pod.py index 8056a3f2e9..706d9d9071 100644 --- a/magnum/db/sqlalchemy/alembic/versions/53882537ac57_add_host_column_to_pod.py +++ b/magnum/db/sqlalchemy/alembic/versions/53882537ac57_add_host_column_to_pod.py @@ -23,8 +23,8 @@ Create Date: 2015-06-25 16:52:47.159887 revision = '53882537ac57' down_revision = '1c1ff5e56048' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/5518af8dbc21_rename_cert_uuid.py b/magnum/db/sqlalchemy/alembic/versions/5518af8dbc21_rename_cert_uuid.py index 13ef18f7b9..dc2294a0f1 100644 --- a/magnum/db/sqlalchemy/alembic/versions/5518af8dbc21_rename_cert_uuid.py +++ b/magnum/db/sqlalchemy/alembic/versions/5518af8dbc21_rename_cert_uuid.py @@ -21,13 +21,13 @@ Create Date: 2015-08-28 13:13:19.747625 revision = '5518af8dbc21' down_revision = '6f21dc920bb' -from alembic import op +from alembic import op # noqa: E402 # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TEXT +from sqlalchemy.dialects.mysql import TEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/5793cd26898d_add_bay_status.py b/magnum/db/sqlalchemy/alembic/versions/5793cd26898d_add_bay_status.py index 59f0df4533..c5ccfb9f11 100644 --- a/magnum/db/sqlalchemy/alembic/versions/5793cd26898d_add_bay_status.py +++ b/magnum/db/sqlalchemy/alembic/versions/5793cd26898d_add_bay_status.py @@ -21,8 +21,8 @@ Create Date: 2015-02-09 12:54:09.449948 revision = '5793cd26898d' down_revision = '3bea56f25597' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/57fbdf2327a2_remove_baylock.py b/magnum/db/sqlalchemy/alembic/versions/57fbdf2327a2_remove_baylock.py index 492e52dcbd..b5595e0ba2 100644 --- a/magnum/db/sqlalchemy/alembic/versions/57fbdf2327a2_remove_baylock.py +++ b/magnum/db/sqlalchemy/alembic/versions/57fbdf2327a2_remove_baylock.py @@ -22,7 +22,7 @@ Create Date: 2015-12-17 09:27:18.429773 revision = '57fbdf2327a2' down_revision = 'adc3b7679ae' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/592131657ca1_add_coe_column_to_baymodel.py b/magnum/db/sqlalchemy/alembic/versions/592131657ca1_add_coe_column_to_baymodel.py index c3159f69da..cea78eff78 100644 --- a/magnum/db/sqlalchemy/alembic/versions/592131657ca1_add_coe_column_to_baymodel.py +++ b/magnum/db/sqlalchemy/alembic/versions/592131657ca1_add_coe_column_to_baymodel.py @@ -22,14 +22,14 @@ Create Date: 2015-04-17 14:20:17.620995 revision = '592131657ca1' down_revision = '4956f03cabad' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import magnum.conf -import sqlalchemy as sa +import magnum.conf # noqa: E402 +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 CONF = magnum.conf.CONF diff --git a/magnum/db/sqlalchemy/alembic/versions/5977879072a7_add_env_to_container.py b/magnum/db/sqlalchemy/alembic/versions/5977879072a7_add_env_to_container.py index 505f366a42..b255ba2805 100644 --- a/magnum/db/sqlalchemy/alembic/versions/5977879072a7_add_env_to_container.py +++ b/magnum/db/sqlalchemy/alembic/versions/5977879072a7_add_env_to_container.py @@ -22,8 +22,8 @@ Create Date: 2015-11-26 04:10:39.462966 revision = '5977879072a7' down_revision = '417917e778f5' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/59e7664a8ba1_add_container_status.py b/magnum/db/sqlalchemy/alembic/versions/59e7664a8ba1_add_container_status.py index 335bda68ea..c47cbbeb17 100644 --- a/magnum/db/sqlalchemy/alembic/versions/59e7664a8ba1_add_container_status.py +++ b/magnum/db/sqlalchemy/alembic/versions/59e7664a8ba1_add_container_status.py @@ -22,8 +22,8 @@ Create Date: 2015-05-11 11:33:23.125790 revision = '59e7664a8ba1' down_revision = '2b5f24dd95de' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/5ad410481b88_rename_insecure.py b/magnum/db/sqlalchemy/alembic/versions/5ad410481b88_rename_insecure.py index 2184c26c56..9f958ea300 100644 --- a/magnum/db/sqlalchemy/alembic/versions/5ad410481b88_rename_insecure.py +++ b/magnum/db/sqlalchemy/alembic/versions/5ad410481b88_rename_insecure.py @@ -21,8 +21,8 @@ Create Date: 2015-09-29 17:51:10.195121 revision = '5ad410481b88' down_revision = '27ad304554e2' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/5d4caa6e0a42_create_trustee_for_each_bay.py b/magnum/db/sqlalchemy/alembic/versions/5d4caa6e0a42_create_trustee_for_each_bay.py index 075e71ceb4..46108279f6 100644 --- a/magnum/db/sqlalchemy/alembic/versions/5d4caa6e0a42_create_trustee_for_each_bay.py +++ b/magnum/db/sqlalchemy/alembic/versions/5d4caa6e0a42_create_trustee_for_each_bay.py @@ -25,13 +25,13 @@ Create Date: 2016-02-17 14:16:12.927874 revision = '5d4caa6e0a42' down_revision = 'bb42b7cad130' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/68ce16dfd341_add_master_lb_enabled_column_to_baymodel_table.py b/magnum/db/sqlalchemy/alembic/versions/68ce16dfd341_add_master_lb_enabled_column_to_baymodel_table.py index c9447d34ff..1494c6ee54 100644 --- a/magnum/db/sqlalchemy/alembic/versions/68ce16dfd341_add_master_lb_enabled_column_to_baymodel_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/68ce16dfd341_add_master_lb_enabled_column_to_baymodel_table.py @@ -21,8 +21,8 @@ Create Date: 2016-06-23 18:44:55.312413 revision = '68ce16dfd341' down_revision = '085e601a39f6' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/6f21dc920bb_add_cert_uuid_to_bay.py b/magnum/db/sqlalchemy/alembic/versions/6f21dc920bb_add_cert_uuid_to_bay.py index 02354a974f..c7b9a7f9cf 100644 --- a/magnum/db/sqlalchemy/alembic/versions/6f21dc920bb_add_cert_uuid_to_bay.py +++ b/magnum/db/sqlalchemy/alembic/versions/6f21dc920bb_add_cert_uuid_to_bay.py @@ -21,8 +21,8 @@ Create Date: 2015-08-19 13:57:14.863292 revision = '6f21dc920bb' down_revision = '966a99e70ff' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/6f21dc998bb_add_master_addresses_to_bay.py b/magnum/db/sqlalchemy/alembic/versions/6f21dc998bb_add_master_addresses_to_bay.py index 590e9bd60d..1a3792d36f 100644 --- a/magnum/db/sqlalchemy/alembic/versions/6f21dc998bb_add_master_addresses_to_bay.py +++ b/magnum/db/sqlalchemy/alembic/versions/6f21dc998bb_add_master_addresses_to_bay.py @@ -22,9 +22,9 @@ Create Date: 2015-08-20 13:57:14.863292 revision = '6f21dc998bb' down_revision = '421102d1f2d2' -from alembic import op -from magnum.db.sqlalchemy import models -import sqlalchemy as sa +from alembic import op # noqa: E402 +from magnum.db.sqlalchemy import models # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/720f640f43d1_rename_bay_table_to_cluster.py b/magnum/db/sqlalchemy/alembic/versions/720f640f43d1_rename_bay_table_to_cluster.py index 2fed785c24..d59c67ceb3 100644 --- a/magnum/db/sqlalchemy/alembic/versions/720f640f43d1_rename_bay_table_to_cluster.py +++ b/magnum/db/sqlalchemy/alembic/versions/720f640f43d1_rename_bay_table_to_cluster.py @@ -21,8 +21,8 @@ Create Date: 2016-09-02 09:43:41.485934 revision = '720f640f43d1' down_revision = 'fb03fdef8919' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/859fb45df249_remove_replication_controller.py b/magnum/db/sqlalchemy/alembic/versions/859fb45df249_remove_replication_controller.py index b16e87f0ca..b0b43e44b1 100644 --- a/magnum/db/sqlalchemy/alembic/versions/859fb45df249_remove_replication_controller.py +++ b/magnum/db/sqlalchemy/alembic/versions/859fb45df249_remove_replication_controller.py @@ -21,7 +21,7 @@ Create Date: 2016-08-09 13:46:24.052528 revision = '859fb45df249' down_revision = '1f196a3dabae' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/87e62e3c7abc_add_hidden_to_cluster_template.py b/magnum/db/sqlalchemy/alembic/versions/87e62e3c7abc_add_hidden_to_cluster_template.py index c8d0a0f7db..d8dcc52b86 100644 --- a/magnum/db/sqlalchemy/alembic/versions/87e62e3c7abc_add_hidden_to_cluster_template.py +++ b/magnum/db/sqlalchemy/alembic/versions/87e62e3c7abc_add_hidden_to_cluster_template.py @@ -21,8 +21,8 @@ Create Date: 2019-02-05 15:35:26.290751 revision = '87e62e3c7abc' down_revision = 'cbbc65a86986' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/966a99e70ff_add_proxy.py b/magnum/db/sqlalchemy/alembic/versions/966a99e70ff_add_proxy.py index 02e456e0bc..79a558ee40 100644 --- a/magnum/db/sqlalchemy/alembic/versions/966a99e70ff_add_proxy.py +++ b/magnum/db/sqlalchemy/alembic/versions/966a99e70ff_add_proxy.py @@ -21,13 +21,13 @@ Create Date: 2015-08-24 11:23:24.262921 revision = '966a99e70ff' down_revision = '6f21dc998bb' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/9a1539f1cd2c_add_federation_table.py b/magnum/db/sqlalchemy/alembic/versions/9a1539f1cd2c_add_federation_table.py index 4c20c3e3c4..187eff04a2 100644 --- a/magnum/db/sqlalchemy/alembic/versions/9a1539f1cd2c_add_federation_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/9a1539f1cd2c_add_federation_table.py @@ -22,10 +22,10 @@ Create Date: 2017-08-07 11:47:29.865166 revision = '9a1539f1cd2c' down_revision = '041d9a0f1159' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 -from magnum.db.sqlalchemy import models +from magnum.db.sqlalchemy import models # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/a0e7c8450ab1_add_labels_to_cluster.py b/magnum/db/sqlalchemy/alembic/versions/a0e7c8450ab1_add_labels_to_cluster.py index 07c284a2c9..91ad7297cc 100644 --- a/magnum/db/sqlalchemy/alembic/versions/a0e7c8450ab1_add_labels_to_cluster.py +++ b/magnum/db/sqlalchemy/alembic/versions/a0e7c8450ab1_add_labels_to_cluster.py @@ -21,8 +21,8 @@ Create Date: 2017-06-12 10:08:05.501441 revision = 'a0e7c8450ab1' down_revision = 'aa0cc27839af' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/a1136d335540_add_docker_storage_driver_column.py b/magnum/db/sqlalchemy/alembic/versions/a1136d335540_add_docker_storage_driver_column.py index edf103992c..e7e5860820 100644 --- a/magnum/db/sqlalchemy/alembic/versions/a1136d335540_add_docker_storage_driver_column.py +++ b/magnum/db/sqlalchemy/alembic/versions/a1136d335540_add_docker_storage_driver_column.py @@ -21,8 +21,8 @@ Create Date: 2016-03-07 19:00:28.738486 revision = 'a1136d335540' down_revision = 'd072f58ab240' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 docker_storage_driver_enum = sa.Enum('devicemapper', 'overlay', diff --git a/magnum/db/sqlalchemy/alembic/versions/aa0cc27839af_add_docker_volume_size_to_cluster.py b/magnum/db/sqlalchemy/alembic/versions/aa0cc27839af_add_docker_volume_size_to_cluster.py index 75dcdc7405..f7b7507c2c 100644 --- a/magnum/db/sqlalchemy/alembic/versions/aa0cc27839af_add_docker_volume_size_to_cluster.py +++ b/magnum/db/sqlalchemy/alembic/versions/aa0cc27839af_add_docker_volume_size_to_cluster.py @@ -21,8 +21,8 @@ Create Date: 2017-06-07 13:08:02.853105 revision = 'aa0cc27839af' down_revision = 'bc46ba6cf949' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/ac92cbae311c_add_nodegoup_table.py b/magnum/db/sqlalchemy/alembic/versions/ac92cbae311c_add_nodegoup_table.py index 3cbc08a6dc..ff772e2f5a 100644 --- a/magnum/db/sqlalchemy/alembic/versions/ac92cbae311c_add_nodegoup_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/ac92cbae311c_add_nodegoup_table.py @@ -25,13 +25,13 @@ Create Date: 2018-09-20 15:26:00.869885 revision = 'ac92cbae311c' down_revision = '87e62e3c7abc' -from alembic import op +from alembic import op # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -from magnum.db.sqlalchemy import models +from magnum.db.sqlalchemy import models # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/adc3b7679ae_add_registry_trust_id_to_bay.py b/magnum/db/sqlalchemy/alembic/versions/adc3b7679ae_add_registry_trust_id_to_bay.py index c780d10f5e..20e63fd7a5 100644 --- a/magnum/db/sqlalchemy/alembic/versions/adc3b7679ae_add_registry_trust_id_to_bay.py +++ b/magnum/db/sqlalchemy/alembic/versions/adc3b7679ae_add_registry_trust_id_to_bay.py @@ -22,8 +22,8 @@ Create Date: 2015-12-07 15:49:07.622122 revision = 'adc3b7679ae' down_revision = '40f325033343' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/b1f612248cab_add_floating_ip_enabled_column_to_.py b/magnum/db/sqlalchemy/alembic/versions/b1f612248cab_add_floating_ip_enabled_column_to_.py index f90e5712ea..01e2d39ac8 100644 --- a/magnum/db/sqlalchemy/alembic/versions/b1f612248cab_add_floating_ip_enabled_column_to_.py +++ b/magnum/db/sqlalchemy/alembic/versions/b1f612248cab_add_floating_ip_enabled_column_to_.py @@ -21,8 +21,8 @@ Create Date: 2016-08-05 15:31:46.203266 revision = 'b1f612248cab' down_revision = '859fb45df249' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/bb42b7cad130_remove_node_object.py b/magnum/db/sqlalchemy/alembic/versions/bb42b7cad130_remove_node_object.py index 53ff07690c..6312341804 100644 --- a/magnum/db/sqlalchemy/alembic/versions/bb42b7cad130_remove_node_object.py +++ b/magnum/db/sqlalchemy/alembic/versions/bb42b7cad130_remove_node_object.py @@ -22,7 +22,7 @@ Create Date: 2016-02-02 16:04:36.501547 revision = 'bb42b7cad130' down_revision = '05d3e97de9ee' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/bc46ba6cf949_add_keypair_to_cluster.py b/magnum/db/sqlalchemy/alembic/versions/bc46ba6cf949_add_keypair_to_cluster.py index d40c265fc5..f43b9658d7 100644 --- a/magnum/db/sqlalchemy/alembic/versions/bc46ba6cf949_add_keypair_to_cluster.py +++ b/magnum/db/sqlalchemy/alembic/versions/bc46ba6cf949_add_keypair_to_cluster.py @@ -23,8 +23,8 @@ Create Date: 2016-10-03 10:47:08.584635 revision = 'bc46ba6cf949' down_revision = '720f640f43d1' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/c04e925e65c2_nodegroups_v2.py b/magnum/db/sqlalchemy/alembic/versions/c04e925e65c2_nodegroups_v2.py index 88b099cf6d..a3ec029bad 100644 --- a/magnum/db/sqlalchemy/alembic/versions/c04e925e65c2_nodegroups_v2.py +++ b/magnum/db/sqlalchemy/alembic/versions/c04e925e65c2_nodegroups_v2.py @@ -25,11 +25,11 @@ Create Date: 2019-06-14 09:29:58.288671 revision = 'c04e925e65c2' down_revision = '47380964133d' -from alembic import op +from alembic import op # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/cbbc65a86986_add_health_status_to_cluster.py b/magnum/db/sqlalchemy/alembic/versions/cbbc65a86986_add_health_status_to_cluster.py index e350aac446..def36656f3 100644 --- a/magnum/db/sqlalchemy/alembic/versions/cbbc65a86986_add_health_status_to_cluster.py +++ b/magnum/db/sqlalchemy/alembic/versions/cbbc65a86986_add_health_status_to_cluster.py @@ -23,8 +23,8 @@ Create Date: 2018-05-15 22:24:49.527558 revision = 'cbbc65a86986' down_revision = '9a1539f1cd2c' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/d072f58ab240_modify_x509keypair_table.py b/magnum/db/sqlalchemy/alembic/versions/d072f58ab240_modify_x509keypair_table.py index b6d8f83777..d219ba4ee5 100644 --- a/magnum/db/sqlalchemy/alembic/versions/d072f58ab240_modify_x509keypair_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/d072f58ab240_modify_x509keypair_table.py @@ -25,8 +25,8 @@ Create Date: 2016-05-27 15:29:22.955268 revision = 'd072f58ab240' down_revision = 'ef08a5e057bd' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/e0653b2d5271_add_fixed_subnet_column_to_baymodel_table.py b/magnum/db/sqlalchemy/alembic/versions/e0653b2d5271_add_fixed_subnet_column_to_baymodel_table.py index 4e7644eeab..abc5362711 100644 --- a/magnum/db/sqlalchemy/alembic/versions/e0653b2d5271_add_fixed_subnet_column_to_baymodel_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/e0653b2d5271_add_fixed_subnet_column_to_baymodel_table.py @@ -21,13 +21,13 @@ Create Date: 2016-06-29 14:14:37.862594 revision = 'e0653b2d5271' down_revision = '68ce16dfd341' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/e647f5931da8_add_insecure_registry_to_baymodel.py b/magnum/db/sqlalchemy/alembic/versions/e647f5931da8_add_insecure_registry_to_baymodel.py index 0dee5ecdf0..b734d14b84 100644 --- a/magnum/db/sqlalchemy/alembic/versions/e647f5931da8_add_insecure_registry_to_baymodel.py +++ b/magnum/db/sqlalchemy/alembic/versions/e647f5931da8_add_insecure_registry_to_baymodel.py @@ -21,13 +21,13 @@ Create Date: 2016-03-28 09:08:07.467102 revision = 'e647f5931da8' down_revision = '049f81f6f584' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/e772b2598d9_add_container_command.py b/magnum/db/sqlalchemy/alembic/versions/e772b2598d9_add_container_command.py index 66859c9105..cd5e453a88 100644 --- a/magnum/db/sqlalchemy/alembic/versions/e772b2598d9_add_container_command.py +++ b/magnum/db/sqlalchemy/alembic/versions/e772b2598d9_add_container_command.py @@ -21,8 +21,8 @@ Create Date: 2015-04-17 18:59:52.770329 revision = 'e772b2598d9' down_revision = '4ea34a59a64c' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/ee92b41b8809_create_quotas_table.py b/magnum/db/sqlalchemy/alembic/versions/ee92b41b8809_create_quotas_table.py index 7c44421647..6c96fa63b3 100644 --- a/magnum/db/sqlalchemy/alembic/versions/ee92b41b8809_create_quotas_table.py +++ b/magnum/db/sqlalchemy/alembic/versions/ee92b41b8809_create_quotas_table.py @@ -24,8 +24,8 @@ Create Date: 2016-02-26 18:32:08.992964 revision = 'ee92b41b8809' down_revision = '5d4caa6e0a42' -from alembic import op -import sqlalchemy as sa +from alembic import op # noqa: E402 +import sqlalchemy as sa # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/ef08a5e057bd_remove_pod.py b/magnum/db/sqlalchemy/alembic/versions/ef08a5e057bd_remove_pod.py index 82a9a9cf8d..9d57c5ac92 100644 --- a/magnum/db/sqlalchemy/alembic/versions/ef08a5e057bd_remove_pod.py +++ b/magnum/db/sqlalchemy/alembic/versions/ef08a5e057bd_remove_pod.py @@ -21,7 +21,7 @@ Create Date: 2016-05-24 13:52:39.782156 revision = 'ef08a5e057bd' down_revision = 'e647f5931da8' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/fb03fdef8919_rename_baymodel_to_clustertemplate.py b/magnum/db/sqlalchemy/alembic/versions/fb03fdef8919_rename_baymodel_to_clustertemplate.py index 9a7f1b1ee1..37fed676b4 100644 --- a/magnum/db/sqlalchemy/alembic/versions/fb03fdef8919_rename_baymodel_to_clustertemplate.py +++ b/magnum/db/sqlalchemy/alembic/versions/fb03fdef8919_rename_baymodel_to_clustertemplate.py @@ -21,7 +21,7 @@ Create Date: 2016-08-31 12:40:31.165817 revision = 'fb03fdef8919' down_revision = 'fcb4efee8f8b' -from alembic import op +from alembic import op # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/alembic/versions/fcb4efee8f8b_add_version_info_to_bay.py b/magnum/db/sqlalchemy/alembic/versions/fcb4efee8f8b_add_version_info_to_bay.py index a4a0cc77b9..10d51fa0ca 100644 --- a/magnum/db/sqlalchemy/alembic/versions/fcb4efee8f8b_add_version_info_to_bay.py +++ b/magnum/db/sqlalchemy/alembic/versions/fcb4efee8f8b_add_version_info_to_bay.py @@ -21,13 +21,13 @@ Create Date: 2016-08-22 15:04:32.256811 revision = 'fcb4efee8f8b' down_revision = 'b1f612248cab' -from alembic import op +from alembic import op # noqa: E402 -from oslo_db.sqlalchemy.types import String +from oslo_db.sqlalchemy.types import String # noqa: E402 -import sqlalchemy as sa +import sqlalchemy as sa # noqa: E402 -from sqlalchemy.dialects.mysql import TINYTEXT +from sqlalchemy.dialects.mysql import TINYTEXT # noqa: E402 def upgrade(): diff --git a/magnum/db/sqlalchemy/models.py b/magnum/db/sqlalchemy/models.py index 5ba7751893..286a8bed2e 100644 --- a/magnum/db/sqlalchemy/models.py +++ b/magnum/db/sqlalchemy/models.py @@ -98,6 +98,7 @@ class MagnumBase(models.TimestampMixin, super(MagnumBase, self).save(session) + Base = declarative_base(cls=MagnumBase) diff --git a/magnum/drivers/heat/driver.py b/magnum/drivers/heat/driver.py index a6029d0ef3..f427cfa2c2 100755 --- a/magnum/drivers/heat/driver.py +++ b/magnum/drivers/heat/driver.py @@ -366,7 +366,7 @@ class FedoraKubernetesDriver(KubernetesDriver): new_labels.update({'kube_tag': new_kube_tag}) return new_labels - def upgrade_cluster(self, context, cluster, cluster_template, + def upgrade_cluster(self, context, cluster, cluster_template, # noqa: C901 max_batch_size, nodegroup, scale_manager=None, rollback=False): osc = clients.OpenStackClients(context) diff --git a/magnum/hacking/checks.py b/magnum/hacking/checks.py index ee264d8881..7a02ef2e50 100755 --- a/magnum/hacking/checks.py +++ b/magnum/hacking/checks.py @@ -15,7 +15,7 @@ import re -import pep8 # noqa +from hacking import core """ Guidelines for writing new hacking checks @@ -42,7 +42,7 @@ assert_equal_with_is_not_none_re = re.compile( r"assertEqual\(.*?\s+is+\s+not+\s+None\)$") assert_true_isinstance_re = re.compile( r"(.)*assertTrue\(isinstance\((\w|\.|\'|\"|\[|\])+, " - "(\w|\.|\'|\"|\[|\])+\)\)") + r"(\w|\.|\'|\"|\[|\])+\)\)") dict_constructor_with_list_copy_re = re.compile(r".*\bdict\((\[)?(\(|\[)") assert_xrange_re = re.compile( r"\s*xrange\s*\(") @@ -58,16 +58,18 @@ custom_underscore_check = re.compile(r"(.)*_\s*=\s*(.)*") underscore_import_check = re.compile(r"(.)*import _(.)*") translated_log = re.compile( r"(.)*LOG\.(audit|error|info|critical|exception)" - "\(\s*_\(\s*('|\")") + r"\(\s*_\(\s*('|\")") string_translation = re.compile(r"[^_]*_\(\s*('|\")") +@core.flake8ext def no_mutable_default_args(logical_line): msg = "M322: Method's default argument shouldn't be mutable!" if mutable_default_args.match(logical_line): yield (0, msg) +@core.flake8ext def assert_equal_not_none(logical_line): """Check for assertEqual(A is not None) sentences M302""" msg = "M302: assertEqual(A is not None) sentences not allowed." @@ -76,6 +78,7 @@ def assert_equal_not_none(logical_line): yield (0, msg) +@core.flake8ext def assert_true_isinstance(logical_line): """Check for assertTrue(isinstance(a, b)) sentences @@ -85,6 +88,7 @@ def assert_true_isinstance(logical_line): yield (0, "M316: assertTrue(isinstance(a, b)) sentences not allowed") +@core.flake8ext def assert_equal_in(logical_line): """Check for assertEqual(True|False, A in B), assertEqual(A in B, True|False) @@ -98,6 +102,7 @@ def assert_equal_in(logical_line): "contents.") +@core.flake8ext def no_xrange(logical_line): """Disallow 'xrange()' @@ -107,6 +112,7 @@ def no_xrange(logical_line): yield(0, "M339: Do not use xrange().") +@core.flake8ext def use_timeutils_utcnow(logical_line, filename): # tools are OK to use the standard datetime module if "/tools/" in filename: @@ -120,6 +126,7 @@ def use_timeutils_utcnow(logical_line, filename): yield (pos, msg % f) +@core.flake8ext def dict_constructor_with_list_copy(logical_line): msg = ("M336: Must use a dict comprehension instead of a dict constructor" " with a sequence of key-value pairs." @@ -128,6 +135,7 @@ def dict_constructor_with_list_copy(logical_line): yield (0, msg) +@core.flake8ext def no_log_warn(logical_line): """Disallow 'LOG.warn(' @@ -142,6 +150,7 @@ def no_log_warn(logical_line): yield (0, msg) +@core.flake8ext def check_explicit_underscore_import(logical_line, filename): """Check for explicit import of the _ function @@ -161,15 +170,3 @@ def check_explicit_underscore_import(logical_line, filename): elif (translated_log.match(logical_line) or string_translation.match(logical_line)): yield(0, "M340: Found use of _() without explicit import of _ !") - - -def factory(register): - register(no_mutable_default_args) - register(assert_equal_not_none) - register(assert_true_isinstance) - register(assert_equal_in) - register(use_timeutils_utcnow) - register(dict_constructor_with_list_copy) - register(no_xrange) - register(no_log_warn) - register(check_explicit_underscore_import) diff --git a/magnum/tests/unit/api/controllers/v1/test_baymodel.py b/magnum/tests/unit/api/controllers/v1/test_baymodel.py index 9ae756563b..eafedb4d60 100644 --- a/magnum/tests/unit/api/controllers/v1/test_baymodel.py +++ b/magnum/tests/unit/api/controllers/v1/test_baymodel.py @@ -640,7 +640,7 @@ class TestPost(api_base.FunctionalTest): mock_image_data.return_value = {'name': 'mock_name', 'os_distro': 'fedora-atomic'} for k, v in baymodel_config_dict.items(): - CONF.set_override(k, v, 'cluster_template') + CONF.set_override(k, v, 'cluster_template') with mock.patch.object( self.dbapi, 'create_cluster_template', wraps=self.dbapi.create_cluster_template) as cc_mock: diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py index 556759d5c6..cef7bbff75 100644 --- a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py @@ -48,7 +48,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'network_driver': 'network_driver', 'volume_driver': 'volume_driver', 'docker_volume_size': 20, - 'master_flavor_id': 'flavor_id', 'docker_storage_driver': 'devicemapper', 'cluster_distro': 'fedora-atomic', 'coe': 'kubernetes', @@ -651,7 +650,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'portal_network_cidr': '10.254.0.0/16', 'project_id': 'project_id', 'max_node_count': 2, - 'keystone_auth_default_policy': self.keystone_auth_default_policy, 'boot_volume_size': '60', 'boot_volume_type': 'lvmdriver-1', 'keystone_auth_default_policy': self.keystone_auth_default_policy, diff --git a/magnum/tests/unit/service/test_periodic.py b/magnum/tests/unit/service/test_periodic.py index 523b3134ef..7cef0d2218 100644 --- a/magnum/tests/unit/service/test_periodic.py +++ b/magnum/tests/unit/service/test_periodic.py @@ -36,6 +36,7 @@ class fake_stack(object): for key, val in kw.items(): setattr(self, key, val) + # This dictionary will be populated by setUp to help mock # the nodegroup list magnum.db.api.get_cluster_nodergoups. cluster_ngs = {} diff --git a/magnum/tests/unit/test_hacking.py b/magnum/tests/unit/test_hacking.py index 3a877340f0..6f56041caa 100644 --- a/magnum/tests/unit/test_hacking.py +++ b/magnum/tests/unit/test_hacking.py @@ -15,7 +15,7 @@ import textwrap import mock -import pep8 +import pycodestyle from magnum.hacking import checks from magnum.tests import base @@ -56,14 +56,14 @@ class HackingTestCase(base.TestCase): # We are patching pep8 so that only the check under test is actually # installed. - @mock.patch('pep8._checks', + @mock.patch('pycodestyle._checks', {'physical_line': {}, 'logical_line': {}, 'tree': {}}) def _run_check(self, code, checker, filename=None): - pep8.register_check(checker) + pycodestyle.register_check(checker) lines = textwrap.dedent(code).strip().splitlines(True) - checker = pep8.Checker(filename=filename, lines=lines) + checker = pycodestyle.Checker(filename=filename, lines=lines) checker.check_all() checker.report._deferred_print.sort() return checker.report._deferred_print diff --git a/test-requirements.txt b/test-requirements.txt index 95591f30a6..2092726c42 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ bashate>=0.5.1 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +hacking>=3.0,<3.1.0 # Apache-2.0 mock>=2.0.0 # BSD oslotest>=3.2.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index f01e6f1664..8f8b1da201 100644 --- a/tox.ini +++ b/tox.ini @@ -156,8 +156,18 @@ filename = *.py,app.wsgi enable-extensions = H106,H203,H904 exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,tools,releasenotes -[hacking] -local-check-factory = magnum.hacking.checks.factory +[flake8:local-plugins] +extension = + M302 = checks:assert_equal_not_none + M310 = checks:use_timeutils_utcnow + M316 = checks:assert_true_isinstance + M322 = checks:no_mutable_default_args + M336 = checks:dict_constructor_with_list_copy + M338 = checks:assert_equal_in + M339 = checks:no_xrange + M340 = checks:check_explicit_underscore_import + M352 = checks:no_log_warn +paths = ./magnum/hacking [testenv:pip-check-reqs] # do not install test-requirements as that will pollute the virtualenv for