sts-sponsors team mailing list archive
-
sts-sponsors team
-
Mailing list archive
-
Message #05039
[Merge] ~adam-collard/maas:bump-black-to-23.1 into maas:master
Adam Collard has proposed merging ~adam-collard/maas:bump-black-to-23.1 into maas:master.
Commit message:
[lint] Bump black to 23.1, re-run black
Bump flake8 and isort to latest versions
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~adam-collard/maas/+git/maas/+merge/437195
--
Your team MAAS Maintainers is requested to review the proposed merge of ~adam-collard/maas:bump-black-to-23.1 into maas:master.
diff --git a/setup.cfg b/setup.cfg
index 060f957..3040ef0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -104,9 +104,9 @@ cog_files =
deps_lint =
- black == 22.6.0
- flake8 == 5.0.4
- isort == 5.7.0
+ black == 23.1.0
+ flake8 == 6.0.0
+ isort == 5.12.0
cogapp == 3.3.0
click == 8.1.3
diff --git a/src/maascli/init.py b/src/maascli/init.py
index 6d70ee5..589cb62 100644
--- a/src/maascli/init.py
+++ b/src/maascli/init.py
@@ -23,7 +23,6 @@ def deprecated_for(new_option):
"""
class DeprecatedAction(argparse.Action):
-
_new_option = new_option
_deprecation_message = (
'Note: "{option_string}" is deprecated and will be removed, '
diff --git a/src/maascli/tests/test_snap.py b/src/maascli/tests/test_snap.py
index 00f5262..a4fad9e 100644
--- a/src/maascli/tests/test_snap.py
+++ b/src/maascli/tests/test_snap.py
@@ -129,7 +129,6 @@ class TestHelpers(MAASTestCase):
class TestRenderSupervisord:
-
TEST_TEMPLATE = dedent(
"""\
{{if regiond}}
diff --git a/src/maasserver/api/doc_oapi.py b/src/maasserver/api/doc_oapi.py
index c0d0212..e252bbc 100644
--- a/src/maasserver/api/doc_oapi.py
+++ b/src/maasserver/api/doc_oapi.py
@@ -241,7 +241,7 @@ def _oapi_item_from_docstring(
if required:
body.setdefault("required", []).append(name)
- for (status, content) in _response_pair(ap_dict):
+ for status, content in _response_pair(ap_dict):
response = {
"description": _prettify(
content.get(
diff --git a/src/maasserver/api/support.py b/src/maasserver/api/support.py
index db8b222..0c1eb67 100644
--- a/src/maasserver/api/support.py
+++ b/src/maasserver/api/support.py
@@ -150,7 +150,8 @@ def operation(idempotent, exported_as=None):
def deprecated(use):
"""Decorator to note a method or class is deprecated on the API.
- :param use: Name of the method or class that should be used in place of this method"""
+ :param use: Name of the method or class that should be used in place of this method
+ """
# TODO: Determine any other behaviours we might want from this decorator in future
diff --git a/src/maasserver/api/tests/test_api.py b/src/maasserver/api/tests/test_api.py
index a51f493..95ea4ea 100644
--- a/src/maasserver/api/tests/test_api.py
+++ b/src/maasserver/api/tests/test_api.py
@@ -143,7 +143,6 @@ class TestXSSBugs(APITestCase.ForUser):
class TestAccountAPI(APITestCase.ForUser):
-
clientfactories = {
"user+pass": MAASSensibleClient,
"oauth": MAASSensibleOAuthClient,
@@ -619,7 +618,6 @@ class TestMAASAPIAnon(APITestCase.ForAnonymous):
class TestMAASAPIVersioning(APITestCase.ForAnonymousAndUserAndAdmin):
-
clientfactories = {
"user+pass": MAASSensibleClient,
"oauth": MAASSensibleOAuthClient,
@@ -649,7 +647,6 @@ class TestMAASAPIVersioning(APITestCase.ForAnonymousAndUserAndAdmin):
class TestMAASAPI(APITestCase.ForUser):
-
clientfactories = {
"user+pass": MAASSensibleClient,
"oauth": MAASSensibleOAuthClient,
diff --git a/src/maasserver/api/tests/test_interfaces.py b/src/maasserver/api/tests/test_interfaces.py
index 1b4a21a..9ead44f 100644
--- a/src/maasserver/api/tests/test_interfaces.py
+++ b/src/maasserver/api/tests/test_interfaces.py
@@ -805,7 +805,6 @@ class TestInterfacesAPI(APITestCase.ForUser):
class TestInterfacesAPIForControllers(APITestCase.ForUser):
-
scenarios = (
("region", {"maker": factory.make_RegionController}),
("rack", {"maker": factory.make_RackController}),
@@ -2002,7 +2001,6 @@ class TestNodeInterfaceAPI(APITransactionTestCase.ForUser):
class TestInterfaceAPIForControllers(APITestCase.ForUser):
-
scenarios = (
("region", {"maker": factory.make_RegionController}),
("rack", {"maker": factory.make_RackController}),
diff --git a/src/maasserver/api/tests/test_ipaddresses.py b/src/maasserver/api/tests/test_ipaddresses.py
index 082d1a3..63c9d60 100644
--- a/src/maasserver/api/tests/test_ipaddresses.py
+++ b/src/maasserver/api/tests/test_ipaddresses.py
@@ -224,7 +224,6 @@ class TestIPAddressesAPI(APITestCase.ForUserAndAdmin):
class TestIPAddressesReleaseAPI(APITransactionTestCase.ForUserAndAdmin):
-
scenarios = (
("normal", {"force": None}),
("without_force", {"force": False}),
@@ -445,7 +444,6 @@ class TestIPAddressesReleaseAPI(APITransactionTestCase.ForUserAndAdmin):
class TestIPAddressesReserveAPI(APITransactionTestCase.ForUser):
-
scenarios = (
("with_ip_param", {"ip_param": "ip"}),
("with_ip_address_param", {"ip_param": "ip_address"}),
diff --git a/src/maasserver/api/tests/test_maas.py b/src/maasserver/api/tests/test_maas.py
index aa12222..53e716c 100644
--- a/src/maasserver/api/tests/test_maas.py
+++ b/src/maasserver/api/tests/test_maas.py
@@ -419,7 +419,6 @@ class TestMAASHandlerAPI(APITestCase.ForUser):
class TestMAASHandlerAPIForProxyPort(APITestCase.ForUser):
-
scenarios = [
("valid-port", {"port": random.randint(5300, 65535), "valid": True}),
(
diff --git a/src/maasserver/api/tests/test_node.py b/src/maasserver/api/tests/test_node.py
index 53dba0c..32a99cc 100644
--- a/src/maasserver/api/tests/test_node.py
+++ b/src/maasserver/api/tests/test_node.py
@@ -605,7 +605,6 @@ class TestPowerParameters(APITestCase.ForUser):
class TestSetWorkloadAnnotations(APITestCase.ForUser):
-
scenarios = (
(
"machine",
diff --git a/src/maasserver/api/tests/test_nodedevices.py b/src/maasserver/api/tests/test_nodedevices.py
index 5f64216..2b8f257 100644
--- a/src/maasserver/api/tests/test_nodedevices.py
+++ b/src/maasserver/api/tests/test_nodedevices.py
@@ -39,7 +39,6 @@ class TestNodeDevicesAPI(APITestCase.ForUser):
class TestNodeDevicesAPIFilter(APITestCase.ForUser):
-
scenarios = [
("filter=bus", {"choices": NODE_DEVICE_BUS_CHOICES, "key": "bus"}),
(
diff --git a/src/maasserver/api/tests/test_not_found.py b/src/maasserver/api/tests/test_not_found.py
index e7b2822..0392df6 100644
--- a/src/maasserver/api/tests/test_not_found.py
+++ b/src/maasserver/api/tests/test_not_found.py
@@ -14,7 +14,6 @@ from maasserver.testing.factory import factory
class TestNotFoundHandler(APITestCase.ForAnonymousAndUserAndAdmin):
-
scenarios = (
("GET", dict(method="get")),
("POST", dict(method="post")),
diff --git a/src/maasserver/auth/local.py b/src/maasserver/auth/local.py
index 904484f..f0e55c2 100644
--- a/src/maasserver/auth/local.py
+++ b/src/maasserver/auth/local.py
@@ -60,7 +60,6 @@ ADMIN_PERMISSIONS = (
class MAASAuthorizationBackend(ModelBackend):
-
supports_object_permissions = True
def authenticate(self, request, username=None, password=None, **kwargs):
diff --git a/src/maasserver/auth/tests/test_auth.py b/src/maasserver/auth/tests/test_auth.py
index 0a67fb4..d1ab9b1 100644
--- a/src/maasserver/auth/tests/test_auth.py
+++ b/src/maasserver/auth/tests/test_auth.py
@@ -1056,7 +1056,6 @@ class TestMAASAuthorizationBackendInterface(
class TestMAASAuthorizationBackendForUnrestrictedRead(MAASServerTestCase):
-
scenarios = (
("dnsdata", {"factory": factory.make_DNSData}),
("dnsresource", {"factory": factory.make_DNSResource}),
@@ -1120,7 +1119,6 @@ class TestMAASAuthorizationBackendForUnrestrictedRead(MAASServerTestCase):
class TestMAASAuthorizationBackendForAdminRestricted(MAASServerTestCase):
-
scenarios = (("discovery", {"factory": factory.make_Discovery}),)
def test_user_cannot_view(self):
diff --git a/src/maasserver/conftest.py b/src/maasserver/conftest.py
index 063bfe9..2ebad31 100644
--- a/src/maasserver/conftest.py
+++ b/src/maasserver/conftest.py
@@ -38,7 +38,6 @@ def vault_regionconfig(mocker):
class MockKVStore:
-
expected_mount_point = "secret"
def __init__(self):
diff --git a/src/maasserver/enum.py b/src/maasserver/enum.py
index 1238e58..736ad3f 100644
--- a/src/maasserver/enum.py
+++ b/src/maasserver/enum.py
@@ -395,7 +395,6 @@ IPRANGE_TYPE_CHOICES = (
class POWER_STATE:
-
# Node is on
ON = "on"
@@ -871,7 +870,6 @@ class NODE_METADATA:
class ENDPOINT:
-
API = 0
UI = 1
CLI = 2
@@ -885,7 +883,6 @@ ENDPOINT_CHOICES = (
class NODE_DEVICE_BUS:
-
PCIE = 1
USB = 2
diff --git a/src/maasserver/forms/pods.py b/src/maasserver/forms/pods.py
index 55c527a..15ec560 100644
--- a/src/maasserver/forms/pods.py
+++ b/src/maasserver/forms/pods.py
@@ -815,5 +815,4 @@ class ComposeMachineForPodsForm(forms.Form):
class DeletePodForm(forms.Form):
-
decompose = BooleanField(required=False, initial=False)
diff --git a/src/maasserver/forms/script.py b/src/maasserver/forms/script.py
index 22e8f4e..e23b6ed 100644
--- a/src/maasserver/forms/script.py
+++ b/src/maasserver/forms/script.py
@@ -37,7 +37,6 @@ from provisioningserver.events import EVENT_TYPES
class ScriptForm(ModelForm):
-
script_type = CharField(
label="Script type",
required=False,
diff --git a/src/maasserver/forms/tests/test_filesystem.py b/src/maasserver/forms/tests/test_filesystem.py
index af93578..c1b3f61 100644
--- a/src/maasserver/forms/tests/test_filesystem.py
+++ b/src/maasserver/forms/tests/test_filesystem.py
@@ -40,7 +40,6 @@ class TestMountFilesystemFormWithoutSubstrate(MAASServerTestCase):
class TestMountFilesystemForm(MAASServerTestCase):
-
scenarios = (
(
"partition",
@@ -208,7 +207,6 @@ class TestMountNonStorageFilesystemForm(MAASServerTestCase):
class TestMountNonStorageFilesystemFormScenarios(MAASServerTestCase):
-
scenarios = [
(displayname, {"fstype": name, "acquired": acquired})
for name, displayname in FILESYSTEM_FORMAT_TYPE_CHOICES
@@ -300,7 +298,6 @@ class TestUnmountNonStorageFilesystemForm(MAASServerTestCase):
class TestUnmountNonStorageFilesystemFormScenarios(MAASServerTestCase):
-
scenarios = [
(displayname, {"fstype": name})
for name, displayname in FILESYSTEM_FORMAT_TYPE_CHOICES
diff --git a/src/maasserver/forms/tests/test_helpers.py b/src/maasserver/forms/tests/test_helpers.py
index 0f87abc..3091da6 100644
--- a/src/maasserver/forms/tests/test_helpers.py
+++ b/src/maasserver/forms/tests/test_helpers.py
@@ -134,7 +134,6 @@ class TestHelpers(MAASServerTestCase):
class TestMAASModelForm(MAASLegacyTransactionServerTestCase):
-
apps = ["maasserver.tests"]
def test_model_class_from_UI_has_hidden_field(self):
@@ -173,7 +172,6 @@ class TestMAASModelForm(MAASLegacyTransactionServerTestCase):
self.fields["early_field"] = CharField(required=False)
class TestForm(EarlyFieldMixin, MAASModelForm):
-
extra_field = CharField(required=False)
def clean_early_field(self, *args, **kwargs):
diff --git a/src/maasserver/forms/tests/test_interface.py b/src/maasserver/forms/tests/test_interface.py
index 86d812f..0ce7041 100644
--- a/src/maasserver/forms/tests/test_interface.py
+++ b/src/maasserver/forms/tests/test_interface.py
@@ -28,7 +28,6 @@ from maasserver.utils.forms import compose_invalid_choice_text
class TestGetInterfaceForm(MAASServerTestCase):
-
scenarios = [
(
"physical",
@@ -51,7 +50,6 @@ class TestGetInterfaceFormError(MAASServerTestCase):
class TestControllerInterfaceForm(MAASServerTestCase):
-
scenarios = (
("region", {"maker": factory.make_RegionController}),
("rack", {"maker": factory.make_RackController}),
diff --git a/src/maasserver/forms/tests/test_raid.py b/src/maasserver/forms/tests/test_raid.py
index e3ea59c..15474e3 100644
--- a/src/maasserver/forms/tests/test_raid.py
+++ b/src/maasserver/forms/tests/test_raid.py
@@ -251,7 +251,6 @@ class TestCreateRaidForm(MAASServerTestCase):
class TestUpdateRaidForm(MAASServerTestCase):
-
# Add devices and partitions
def test_add_valid_blockdevice(self):
raid = factory.make_FilesystemGroup(
diff --git a/src/maasserver/management/commands/_config.py b/src/maasserver/management/commands/_config.py
index 34e5594..91a36f8 100644
--- a/src/maasserver/management/commands/_config.py
+++ b/src/maasserver/management/commands/_config.py
@@ -146,7 +146,6 @@ class LocalConfigCommand(BaseCommand):
class GetCommand(LocalConfigCommand):
-
# Do NOT dump to self.stdout; Django does some odd things wrapping stdout,
# like automatically injecting line breaks, and these break the YAML/JSON
# output.
@@ -217,7 +216,6 @@ class ResetCommand(LocalConfigCommand):
class SetCommand(LocalConfigCommand):
-
help = "Set local configuration for the MAAS region controller."
def add_arguments(self, parser):
diff --git a/src/maasserver/management/commands/configauth.py b/src/maasserver/management/commands/configauth.py
index 8fc03fc..413e87b 100644
--- a/src/maasserver/management/commands/configauth.py
+++ b/src/maasserver/management/commands/configauth.py
@@ -27,7 +27,6 @@ from maasserver.utils.dns import validate_url
@dataclass
class _AuthDetails:
-
url: str = ""
domain: str = ""
user: str = ""
diff --git a/src/maasserver/management/commands/edit_named_options.py b/src/maasserver/management/commands/edit_named_options.py
index 47ff357..6f5313e 100644
--- a/src/maasserver/management/commands/edit_named_options.py
+++ b/src/maasserver/management/commands/edit_named_options.py
@@ -21,7 +21,6 @@ from provisioningserver.dns.commands.edit_named_options import (
class Command(BaseCommand):
-
help = " ".join(
dedent(
"""\
diff --git a/src/maasserver/management/commands/tests/test_config.py b/src/maasserver/management/commands/tests/test_config.py
index 49a04f7..bf73716 100644
--- a/src/maasserver/management/commands/tests/test_config.py
+++ b/src/maasserver/management/commands/tests/test_config.py
@@ -79,7 +79,6 @@ class TestConfigurationGet(MAASTestCase):
class TestConfigurationReset(MAASTestCase):
-
scenarios = tuple(
(option, {"option": option.lstrip("-").replace("-", "_")})
for option, args in config.gen_configuration_options_for_resetting()
@@ -105,7 +104,6 @@ class TestConfigurationReset(MAASTestCase):
class TestConfigurationSet(MAASTestCase):
-
scenarios = tuple(
(option, {"option": option.lstrip("-").replace("-", "_")})
for option, args in config.gen_configuration_options_for_setting()
@@ -189,7 +187,6 @@ class TestConfigurationSet_DatabasePort(MAASTestCase):
class TestConfigurationCommon(MAASTestCase):
-
is_string = IsInstance(str)
is_single_line = AfterPreprocessing(str.splitlines, HasLength(1))
is_help_string = MatchesAll(is_string, is_single_line, first_only=True)
diff --git a/src/maasserver/management/commands/tests/test_dbupgrade.py b/src/maasserver/management/commands/tests/test_dbupgrade.py
index bbc5ca6..2e62a6d 100644
--- a/src/maasserver/management/commands/tests/test_dbupgrade.py
+++ b/src/maasserver/management/commands/tests/test_dbupgrade.py
@@ -58,7 +58,6 @@ def get_all_triggers(conn):
class TestDBUpgrade(MAASTestCase):
-
dbname = "test_maas_dbupgrade"
def setUp(self):
diff --git a/src/maasserver/middleware.py b/src/maasserver/middleware.py
index 76c7fe7..5c2fbf4 100644
--- a/src/maasserver/middleware.py
+++ b/src/maasserver/middleware.py
@@ -207,7 +207,6 @@ class ExceptionMiddleware:
class DebuggingLoggerMiddleware:
-
log_level = logging.DEBUG
def __init__(self, get_response):
diff --git a/src/maasserver/migrations/auth/0001_initial.py b/src/maasserver/migrations/auth/0001_initial.py
index 9178ba1..ab00b55 100644
--- a/src/maasserver/migrations/auth/0001_initial.py
+++ b/src/maasserver/migrations/auth/0001_initial.py
@@ -4,7 +4,6 @@ from django.utils import timezone
class Migration(migrations.Migration):
-
dependencies = [("contenttypes", "__first__")]
operations = [
diff --git a/src/maasserver/migrations/auth/0002_auto_20151119_1629.py b/src/maasserver/migrations/auth/0002_auto_20151119_1629.py
index f02e27a..4a7519f 100644
--- a/src/maasserver/migrations/auth/0002_auto_20151119_1629.py
+++ b/src/maasserver/migrations/auth/0002_auto_20151119_1629.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("auth", "0001_initial")]
operations = [
diff --git a/src/maasserver/migrations/auth/0003_django_1_11_update.py b/src/maasserver/migrations/auth/0003_django_1_11_update.py
index cb8157e..4639341 100644
--- a/src/maasserver/migrations/auth/0003_django_1_11_update.py
+++ b/src/maasserver/migrations/auth/0003_django_1_11_update.py
@@ -6,7 +6,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("auth", "0002_auto_20151119_1629")]
operations = [
diff --git a/src/maasserver/migrations/auth/0004_user_email_allow_null.py b/src/maasserver/migrations/auth/0004_user_email_allow_null.py
index fbe82a4..15b03e9 100644
--- a/src/maasserver/migrations/auth/0004_user_email_allow_null.py
+++ b/src/maasserver/migrations/auth/0004_user_email_allow_null.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("auth", "0003_django_1_11_update")]
operations = [
diff --git a/src/maasserver/migrations/auth/0005_auto_20200626_1049.py b/src/maasserver/migrations/auth/0005_auto_20200626_1049.py
index 9381e43..a947943 100644
--- a/src/maasserver/migrations/auth/0005_auto_20200626_1049.py
+++ b/src/maasserver/migrations/auth/0005_auto_20200626_1049.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("auth", "0004_user_email_allow_null")]
operations = [
diff --git a/src/maasserver/migrations/auth/0006_default_auto_field.py b/src/maasserver/migrations/auth/0006_default_auto_field.py
index 1a8c682..df52b8e 100644
--- a/src/maasserver/migrations/auth/0006_default_auto_field.py
+++ b/src/maasserver/migrations/auth/0006_default_auto_field.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("auth", "0005_auto_20200626_1049"),
]
diff --git a/src/maasserver/migrations/maasserver/0001_initial.py b/src/maasserver/migrations/maasserver/0001_initial.py
index 6a5b0af..681c113 100644
--- a/src/maasserver/migrations/maasserver/0001_initial.py
+++ b/src/maasserver/migrations/maasserver/0001_initial.py
@@ -20,7 +20,6 @@ import metadataserver.fields
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("piston3", "0001_initial"),
diff --git a/src/maasserver/migrations/maasserver/0002_remove_candidate_name_model.py b/src/maasserver/migrations/maasserver/0002_remove_candidate_name_model.py
index 8929d91..2090749 100644
--- a/src/maasserver/migrations/maasserver/0002_remove_candidate_name_model.py
+++ b/src/maasserver/migrations/maasserver/0002_remove_candidate_name_model.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0001_initial")]
operations = [migrations.DeleteModel(name="CandidateName")]
diff --git a/src/maasserver/migrations/maasserver/0003_add_node_type_to_node.py b/src/maasserver/migrations/maasserver/0003_add_node_type_to_node.py
index 7a6aa5c..6be4ef6 100644
--- a/src/maasserver/migrations/maasserver/0003_add_node_type_to_node.py
+++ b/src/maasserver/migrations/maasserver/0003_add_node_type_to_node.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0002_remove_candidate_name_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0004_migrate_installable_to_node_type.py b/src/maasserver/migrations/maasserver/0004_migrate_installable_to_node_type.py
index 2aafde1..a84134f 100644
--- a/src/maasserver/migrations/maasserver/0004_migrate_installable_to_node_type.py
+++ b/src/maasserver/migrations/maasserver/0004_migrate_installable_to_node_type.py
@@ -15,7 +15,6 @@ def convert_installable_to_node_type(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0003_add_node_type_to_node")]
operations = [migrations.RunPython(convert_installable_to_node_type)]
diff --git a/src/maasserver/migrations/maasserver/0005_delete_installable_from_node.py b/src/maasserver/migrations/maasserver/0005_delete_installable_from_node.py
index 8c43456..c135708 100644
--- a/src/maasserver/migrations/maasserver/0005_delete_installable_from_node.py
+++ b/src/maasserver/migrations/maasserver/0005_delete_installable_from_node.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0004_migrate_installable_to_node_type")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0006_add_lease_time_to_staticipaddress.py b/src/maasserver/migrations/maasserver/0006_add_lease_time_to_staticipaddress.py
index 70262dd..ec0a8ba 100644
--- a/src/maasserver/migrations/maasserver/0006_add_lease_time_to_staticipaddress.py
+++ b/src/maasserver/migrations/maasserver/0006_add_lease_time_to_staticipaddress.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0005_delete_installable_from_node")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0007_create_node_proxy_models.py b/src/maasserver/migrations/maasserver/0007_create_node_proxy_models.py
index 8ffbf7c..ad958f7 100644
--- a/src/maasserver/migrations/maasserver/0007_create_node_proxy_models.py
+++ b/src/maasserver/migrations/maasserver/0007_create_node_proxy_models.py
@@ -5,7 +5,6 @@ import maasserver.fields
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0006_add_lease_time_to_staticipaddress")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0008_use_new_arrayfield.py b/src/maasserver/migrations/maasserver/0008_use_new_arrayfield.py
index 4cb3633..5f4d628 100644
--- a/src/maasserver/migrations/maasserver/0008_use_new_arrayfield.py
+++ b/src/maasserver/migrations/maasserver/0008_use_new_arrayfield.py
@@ -5,7 +5,6 @@ import maasserver.fields
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0007_create_node_proxy_models")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0009_remove_routers_field_from_node.py b/src/maasserver/migrations/maasserver/0009_remove_routers_field_from_node.py
index a36431c..11c470e 100644
--- a/src/maasserver/migrations/maasserver/0009_remove_routers_field_from_node.py
+++ b/src/maasserver/migrations/maasserver/0009_remove_routers_field_from_node.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0008_use_new_arrayfield")]
operations = [migrations.RemoveField(model_name="node", name="routers")]
diff --git a/src/maasserver/migrations/maasserver/0010_add_dns_models.py b/src/maasserver/migrations/maasserver/0010_add_dns_models.py
index 86dd07e..8f85c34 100644
--- a/src/maasserver/migrations/maasserver/0010_add_dns_models.py
+++ b/src/maasserver/migrations/maasserver/0010_add_dns_models.py
@@ -7,7 +7,6 @@ import maasserver.models.dnsresource
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0009_remove_routers_field_from_node")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0011_domain_data.py b/src/maasserver/migrations/maasserver/0011_domain_data.py
index 612f0d4..1bee15c 100644
--- a/src/maasserver/migrations/maasserver/0011_domain_data.py
+++ b/src/maasserver/migrations/maasserver/0011_domain_data.py
@@ -115,7 +115,6 @@ def migrate_staticipaddress_hostname(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0010_add_dns_models")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0012_drop_dns_fields.py b/src/maasserver/migrations/maasserver/0012_drop_dns_fields.py
index bc52c73..d4f8a36 100644
--- a/src/maasserver/migrations/maasserver/0012_drop_dns_fields.py
+++ b/src/maasserver/migrations/maasserver/0012_drop_dns_fields.py
@@ -7,7 +7,6 @@ import maasserver.models.dnsresource
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0011_domain_data")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0013_remove_boot_type_from_node.py b/src/maasserver/migrations/maasserver/0013_remove_boot_type_from_node.py
index 3a94846..82bbb7d 100644
--- a/src/maasserver/migrations/maasserver/0013_remove_boot_type_from_node.py
+++ b/src/maasserver/migrations/maasserver/0013_remove_boot_type_from_node.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0012_drop_dns_fields")]
operations = [migrations.RemoveField(model_name="node", name="boot_type")]
diff --git a/src/maasserver/migrations/maasserver/0014_add_region_models.py b/src/maasserver/migrations/maasserver/0014_add_region_models.py
index 8340461..259d610 100644
--- a/src/maasserver/migrations/maasserver/0014_add_region_models.py
+++ b/src/maasserver/migrations/maasserver/0014_add_region_models.py
@@ -7,7 +7,6 @@ import maasserver.models.node
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0013_remove_boot_type_from_node")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0015_add_bmc_model.py b/src/maasserver/migrations/maasserver/0015_add_bmc_model.py
index 6f6bb04..e03cf28 100644
--- a/src/maasserver/migrations/maasserver/0015_add_bmc_model.py
+++ b/src/maasserver/migrations/maasserver/0015_add_bmc_model.py
@@ -6,7 +6,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0014_add_region_models")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0016_migrate_power_data_node_to_bmc.py b/src/maasserver/migrations/maasserver/0016_migrate_power_data_node_to_bmc.py
index 145c40d..c3ccb6a 100644
--- a/src/maasserver/migrations/maasserver/0016_migrate_power_data_node_to_bmc.py
+++ b/src/maasserver/migrations/maasserver/0016_migrate_power_data_node_to_bmc.py
@@ -65,7 +65,6 @@ def migrate_power_data_from_node_to_bmc(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0015_add_bmc_model")]
operations = [migrations.RunPython(migrate_power_data_from_node_to_bmc)]
diff --git a/src/maasserver/migrations/maasserver/0017_remove_node_power_type.py b/src/maasserver/migrations/maasserver/0017_remove_node_power_type.py
index 8db8756..1fb404e 100644
--- a/src/maasserver/migrations/maasserver/0017_remove_node_power_type.py
+++ b/src/maasserver/migrations/maasserver/0017_remove_node_power_type.py
@@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0016_migrate_power_data_node_to_bmc")]
operations = [migrations.RemoveField(model_name="node", name="power_type")]
diff --git a/src/maasserver/migrations/maasserver/0018_add_dnsdata.py b/src/maasserver/migrations/maasserver/0018_add_dnsdata.py
index 04375c0..22be568 100644
--- a/src/maasserver/migrations/maasserver/0018_add_dnsdata.py
+++ b/src/maasserver/migrations/maasserver/0018_add_dnsdata.py
@@ -5,7 +5,6 @@ import maasserver.models.dnsdata
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0017_remove_node_power_type")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0019_add_iprange.py b/src/maasserver/migrations/maasserver/0019_add_iprange.py
index 7d3fba6..7319c1f 100644
--- a/src/maasserver/migrations/maasserver/0019_add_iprange.py
+++ b/src/maasserver/migrations/maasserver/0019_add_iprange.py
@@ -6,7 +6,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("maasserver", "0018_add_dnsdata"),
diff --git a/src/maasserver/migrations/maasserver/0020_nodegroup_to_rackcontroller.py b/src/maasserver/migrations/maasserver/0020_nodegroup_to_rackcontroller.py
index a783681..4e98333 100644
--- a/src/maasserver/migrations/maasserver/0020_nodegroup_to_rackcontroller.py
+++ b/src/maasserver/migrations/maasserver/0020_nodegroup_to_rackcontroller.py
@@ -18,7 +18,6 @@ def grab_data(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0019_add_iprange")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0021_nodegroupinterface_to_iprange.py b/src/maasserver/migrations/maasserver/0021_nodegroupinterface_to_iprange.py
index c50bef9..156568d 100644
--- a/src/maasserver/migrations/maasserver/0021_nodegroupinterface_to_iprange.py
+++ b/src/maasserver/migrations/maasserver/0021_nodegroupinterface_to_iprange.py
@@ -85,7 +85,6 @@ def create_ipranges_from_nodegroupinterfaces(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0020_nodegroup_to_rackcontroller")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0022_extract_ip_for_bmcs.py b/src/maasserver/migrations/maasserver/0022_extract_ip_for_bmcs.py
index a577188..f5e1887 100644
--- a/src/maasserver/migrations/maasserver/0022_extract_ip_for_bmcs.py
+++ b/src/maasserver/migrations/maasserver/0022_extract_ip_for_bmcs.py
@@ -96,7 +96,6 @@ def create_staticipaddresses_for_bmcs(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0021_nodegroupinterface_to_iprange")]
operations = [migrations.RunPython(create_staticipaddresses_for_bmcs)]
diff --git a/src/maasserver/migrations/maasserver/0023_add_ttl_field.py b/src/maasserver/migrations/maasserver/0023_add_ttl_field.py
index d7158a6..0c0d71f 100644
--- a/src/maasserver/migrations/maasserver/0023_add_ttl_field.py
+++ b/src/maasserver/migrations/maasserver/0023_add_ttl_field.py
@@ -6,7 +6,6 @@ import maasserver.models.node
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0022_extract_ip_for_bmcs")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0024_remove_nodegroupinterface.py b/src/maasserver/migrations/maasserver/0024_remove_nodegroupinterface.py
index e25a95f..6c76739 100644
--- a/src/maasserver/migrations/maasserver/0024_remove_nodegroupinterface.py
+++ b/src/maasserver/migrations/maasserver/0024_remove_nodegroupinterface.py
@@ -3,7 +3,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0023_add_ttl_field")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0025_create_node_system_id_sequence.py b/src/maasserver/migrations/maasserver/0025_create_node_system_id_sequence.py
index 4cefb06..a34467d 100644
--- a/src/maasserver/migrations/maasserver/0025_create_node_system_id_sequence.py
+++ b/src/maasserver/migrations/maasserver/0025_create_node_system_id_sequence.py
@@ -28,7 +28,6 @@ sequence_drop = "DROP SEQUENCE IF EXISTS maasserver_node_system_id_seq"
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0024_remove_nodegroupinterface")]
operations = [migrations.RunSQL(sequence_create, sequence_drop)]
diff --git a/src/maasserver/migrations/maasserver/0026_create_zone_serial_sequence.py b/src/maasserver/migrations/maasserver/0026_create_zone_serial_sequence.py
index d3e010f..d5c043b 100644
--- a/src/maasserver/migrations/maasserver/0026_create_zone_serial_sequence.py
+++ b/src/maasserver/migrations/maasserver/0026_create_zone_serial_sequence.py
@@ -22,7 +22,6 @@ sequence_drop = "DROP SEQUENCE IF EXISTS maasserver_zone_serial_seq"
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0025_create_node_system_id_sequence")]
operations = [migrations.RunSQL(sequence_create, sequence_drop)]
diff --git a/src/maasserver/migrations/maasserver/0027_replace_static_range_with_admin_reserved_ranges.py b/src/maasserver/migrations/maasserver/0027_replace_static_range_with_admin_reserved_ranges.py
index b294298..5dea43d 100644
--- a/src/maasserver/migrations/maasserver/0027_replace_static_range_with_admin_reserved_ranges.py
+++ b/src/maasserver/migrations/maasserver/0027_replace_static_range_with_admin_reserved_ranges.py
@@ -80,7 +80,6 @@ def migrate_static_ranges_to_admin_reserved(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0026_create_zone_serial_sequence")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0028_update_default_vlan_on_interface_and_subnet.py b/src/maasserver/migrations/maasserver/0028_update_default_vlan_on_interface_and_subnet.py
index 5627212..42627c3 100644
--- a/src/maasserver/migrations/maasserver/0028_update_default_vlan_on_interface_and_subnet.py
+++ b/src/maasserver/migrations/maasserver/0028_update_default_vlan_on_interface_and_subnet.py
@@ -6,7 +6,6 @@ import maasserver.models.subnet
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0027_replace_static_range_with_admin_reserved_ranges")
]
diff --git a/src/maasserver/migrations/maasserver/0029_add_rdns_mode.py b/src/maasserver/migrations/maasserver/0029_add_rdns_mode.py
index b9a6a34..feebe6f 100644
--- a/src/maasserver/migrations/maasserver/0029_add_rdns_mode.py
+++ b/src/maasserver/migrations/maasserver/0029_add_rdns_mode.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0028_update_default_vlan_on_interface_and_subnet")
]
diff --git a/src/maasserver/migrations/maasserver/0030_drop_all_old_funcs.py b/src/maasserver/migrations/maasserver/0030_drop_all_old_funcs.py
index c530c49..69ac830 100644
--- a/src/maasserver/migrations/maasserver/0030_drop_all_old_funcs.py
+++ b/src/maasserver/migrations/maasserver/0030_drop_all_old_funcs.py
@@ -18,7 +18,6 @@ def drop_all_funcs(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0029_add_rdns_mode")]
operations = [migrations.RunPython(drop_all_funcs)]
diff --git a/src/maasserver/migrations/maasserver/0031_add_region_rack_rpc_conn_model.py b/src/maasserver/migrations/maasserver/0031_add_region_rack_rpc_conn_model.py
index 2b33e5f..5f8386f 100644
--- a/src/maasserver/migrations/maasserver/0031_add_region_rack_rpc_conn_model.py
+++ b/src/maasserver/migrations/maasserver/0031_add_region_rack_rpc_conn_model.py
@@ -5,7 +5,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0030_drop_all_old_funcs")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0032_loosen_vlan.py b/src/maasserver/migrations/maasserver/0032_loosen_vlan.py
index 4d4f7f6..b01eb2f 100644
--- a/src/maasserver/migrations/maasserver/0032_loosen_vlan.py
+++ b/src/maasserver/migrations/maasserver/0032_loosen_vlan.py
@@ -4,7 +4,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0031_add_region_rack_rpc_conn_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0033_iprange_minor_changes.py b/src/maasserver/migrations/maasserver/0033_iprange_minor_changes.py
index 11280fb..51532aa 100644
--- a/src/maasserver/migrations/maasserver/0033_iprange_minor_changes.py
+++ b/src/maasserver/migrations/maasserver/0033_iprange_minor_changes.py
@@ -4,7 +4,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0032_loosen_vlan")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0034_rename_mount_params_as_mount_options.py b/src/maasserver/migrations/maasserver/0034_rename_mount_params_as_mount_options.py
index 7871442..f488510 100644
--- a/src/maasserver/migrations/maasserver/0034_rename_mount_params_as_mount_options.py
+++ b/src/maasserver/migrations/maasserver/0034_rename_mount_params_as_mount_options.py
@@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0033_iprange_minor_changes")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0035_convert_ether_wake_to_manual_power_type.py b/src/maasserver/migrations/maasserver/0035_convert_ether_wake_to_manual_power_type.py
index 65acfc9..45aef02 100644
--- a/src/maasserver/migrations/maasserver/0035_convert_ether_wake_to_manual_power_type.py
+++ b/src/maasserver/migrations/maasserver/0035_convert_ether_wake_to_manual_power_type.py
@@ -9,7 +9,6 @@ def convert_ether_wake_to_manual_power_type(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0034_rename_mount_params_as_mount_options")
]
diff --git a/src/maasserver/migrations/maasserver/0036_add_service_model.py b/src/maasserver/migrations/maasserver/0036_add_service_model.py
index 7225c7e..607a456 100644
--- a/src/maasserver/migrations/maasserver/0036_add_service_model.py
+++ b/src/maasserver/migrations/maasserver/0036_add_service_model.py
@@ -4,7 +4,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0035_convert_ether_wake_to_manual_power_type")
]
diff --git a/src/maasserver/migrations/maasserver/0037_node_last_image_sync.py b/src/maasserver/migrations/maasserver/0037_node_last_image_sync.py
index fa17147..bdb4b8d 100644
--- a/src/maasserver/migrations/maasserver/0037_node_last_image_sync.py
+++ b/src/maasserver/migrations/maasserver/0037_node_last_image_sync.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0036_add_service_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0038_filesystem_ramfs_tmpfs_support.py b/src/maasserver/migrations/maasserver/0038_filesystem_ramfs_tmpfs_support.py
index 9644ce1..67252b6 100644
--- a/src/maasserver/migrations/maasserver/0038_filesystem_ramfs_tmpfs_support.py
+++ b/src/maasserver/migrations/maasserver/0038_filesystem_ramfs_tmpfs_support.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0037_node_last_image_sync")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0039_create_template_and_versionedtextfile_models.py b/src/maasserver/migrations/maasserver/0039_create_template_and_versionedtextfile_models.py
index 964025d..dbfbecd 100644
--- a/src/maasserver/migrations/maasserver/0039_create_template_and_versionedtextfile_models.py
+++ b/src/maasserver/migrations/maasserver/0039_create_template_and_versionedtextfile_models.py
@@ -4,7 +4,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0038_filesystem_ramfs_tmpfs_support")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0040_fix_id_seq.py b/src/maasserver/migrations/maasserver/0040_fix_id_seq.py
index 548660f..d51cf80 100644
--- a/src/maasserver/migrations/maasserver/0040_fix_id_seq.py
+++ b/src/maasserver/migrations/maasserver/0040_fix_id_seq.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0039_create_template_and_versionedtextfile_models")
]
diff --git a/src/maasserver/migrations/maasserver/0041_change_bmc_on_delete_to_set_null.py b/src/maasserver/migrations/maasserver/0041_change_bmc_on_delete_to_set_null.py
index afd76e6..fc7c0f7 100644
--- a/src/maasserver/migrations/maasserver/0041_change_bmc_on_delete_to_set_null.py
+++ b/src/maasserver/migrations/maasserver/0041_change_bmc_on_delete_to_set_null.py
@@ -3,7 +3,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0040_fix_id_seq")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0042_add_routable_rack_controllers_to_bmc.py b/src/maasserver/migrations/maasserver/0042_add_routable_rack_controllers_to_bmc.py
index fd4b772..198678e 100644
--- a/src/maasserver/migrations/maasserver/0042_add_routable_rack_controllers_to_bmc.py
+++ b/src/maasserver/migrations/maasserver/0042_add_routable_rack_controllers_to_bmc.py
@@ -4,7 +4,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0041_change_bmc_on_delete_to_set_null")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0043_dhcpsnippet.py b/src/maasserver/migrations/maasserver/0043_dhcpsnippet.py
index 4ff3ccf..e59708f 100644
--- a/src/maasserver/migrations/maasserver/0043_dhcpsnippet.py
+++ b/src/maasserver/migrations/maasserver/0043_dhcpsnippet.py
@@ -4,7 +4,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0042_add_routable_rack_controllers_to_bmc")
]
diff --git a/src/maasserver/migrations/maasserver/0044_remove_di_bootresourcefiles.py b/src/maasserver/migrations/maasserver/0044_remove_di_bootresourcefiles.py
index ce42a74..964e49e 100644
--- a/src/maasserver/migrations/maasserver/0044_remove_di_bootresourcefiles.py
+++ b/src/maasserver/migrations/maasserver/0044_remove_di_bootresourcefiles.py
@@ -24,7 +24,6 @@ def remove_di_bootresourcefiles(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0043_dhcpsnippet")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0045_add_node_to_filesystem.py b/src/maasserver/migrations/maasserver/0045_add_node_to_filesystem.py
index 4085ca4..ed8647e 100644
--- a/src/maasserver/migrations/maasserver/0045_add_node_to_filesystem.py
+++ b/src/maasserver/migrations/maasserver/0045_add_node_to_filesystem.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0044_remove_di_bootresourcefiles")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0046_add_bridge_interface_type.py b/src/maasserver/migrations/maasserver/0046_add_bridge_interface_type.py
index 46db591..1db2c76 100644
--- a/src/maasserver/migrations/maasserver/0046_add_bridge_interface_type.py
+++ b/src/maasserver/migrations/maasserver/0046_add_bridge_interface_type.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0045_add_node_to_filesystem")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0047_fix_spelling_of_degraded.py b/src/maasserver/migrations/maasserver/0047_fix_spelling_of_degraded.py
index 39c39e1..c7017a2 100644
--- a/src/maasserver/migrations/maasserver/0047_fix_spelling_of_degraded.py
+++ b/src/maasserver/migrations/maasserver/0047_fix_spelling_of_degraded.py
@@ -9,7 +9,6 @@ def fix_spelling(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0046_add_bridge_interface_type")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0048_add_subnet_allow_proxy.py b/src/maasserver/migrations/maasserver/0048_add_subnet_allow_proxy.py
index 27cdb96..a3f10cb 100644
--- a/src/maasserver/migrations/maasserver/0048_add_subnet_allow_proxy.py
+++ b/src/maasserver/migrations/maasserver/0048_add_subnet_allow_proxy.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0047_fix_spelling_of_degraded")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0049_add_external_dhcp_present_to_vlan.py b/src/maasserver/migrations/maasserver/0049_add_external_dhcp_present_to_vlan.py
index 1117c9c..b01990e 100644
--- a/src/maasserver/migrations/maasserver/0049_add_external_dhcp_present_to_vlan.py
+++ b/src/maasserver/migrations/maasserver/0049_add_external_dhcp_present_to_vlan.py
@@ -3,7 +3,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0048_add_subnet_allow_proxy")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0050_modify_external_dhcp_on_vlan.py b/src/maasserver/migrations/maasserver/0050_modify_external_dhcp_on_vlan.py
index d7443ae..14693ff 100644
--- a/src/maasserver/migrations/maasserver/0050_modify_external_dhcp_on_vlan.py
+++ b/src/maasserver/migrations/maasserver/0050_modify_external_dhcp_on_vlan.py
@@ -5,7 +5,6 @@ import maasserver.fields
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0049_add_external_dhcp_present_to_vlan")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0051_space_fabric_unique.py b/src/maasserver/migrations/maasserver/0051_space_fabric_unique.py
index a561e44..5625230 100644
--- a/src/maasserver/migrations/maasserver/0051_space_fabric_unique.py
+++ b/src/maasserver/migrations/maasserver/0051_space_fabric_unique.py
@@ -60,7 +60,6 @@ def fix_fabric_names(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0050_modify_external_dhcp_on_vlan")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0052_add_codename_title_eol_to_bootresourcecache.py b/src/maasserver/migrations/maasserver/0052_add_codename_title_eol_to_bootresourcecache.py
index 7715cee..b36e04c 100644
--- a/src/maasserver/migrations/maasserver/0052_add_codename_title_eol_to_bootresourcecache.py
+++ b/src/maasserver/migrations/maasserver/0052_add_codename_title_eol_to_bootresourcecache.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0051_space_fabric_unique")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0053_add_ownerdata_model.py b/src/maasserver/migrations/maasserver/0053_add_ownerdata_model.py
index d4fd9a2..073389a 100644
--- a/src/maasserver/migrations/maasserver/0053_add_ownerdata_model.py
+++ b/src/maasserver/migrations/maasserver/0053_add_ownerdata_model.py
@@ -4,7 +4,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0052_add_codename_title_eol_to_bootresourcecache")
]
diff --git a/src/maasserver/migrations/maasserver/0054_controller.py b/src/maasserver/migrations/maasserver/0054_controller.py
index 8eabf81..fc4e78a 100644
--- a/src/maasserver/migrations/maasserver/0054_controller.py
+++ b/src/maasserver/migrations/maasserver/0054_controller.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0053_add_ownerdata_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0055_dns_publications.py b/src/maasserver/migrations/maasserver/0055_dns_publications.py
index 71577ac..246046b 100644
--- a/src/maasserver/migrations/maasserver/0055_dns_publications.py
+++ b/src/maasserver/migrations/maasserver/0055_dns_publications.py
@@ -5,7 +5,6 @@ import maasserver.models.dnspublication
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0054_controller")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0056_add_description_to_fabric_and_space.py b/src/maasserver/migrations/maasserver/0056_add_description_to_fabric_and_space.py
index 7f4c70c..9caa665 100644
--- a/src/maasserver/migrations/maasserver/0056_add_description_to_fabric_and_space.py
+++ b/src/maasserver/migrations/maasserver/0056_add_description_to_fabric_and_space.py
@@ -6,7 +6,6 @@ import maasserver.models.subnet
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0055_dns_publications")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0056_zone_serial_ownership.py b/src/maasserver/migrations/maasserver/0056_zone_serial_ownership.py
index 5850a6b..4258a2c 100644
--- a/src/maasserver/migrations/maasserver/0056_zone_serial_ownership.py
+++ b/src/maasserver/migrations/maasserver/0056_zone_serial_ownership.py
@@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0055_dns_publications")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0057_initial_dns_publication.py b/src/maasserver/migrations/maasserver/0057_initial_dns_publication.py
index 42d958c..9753c72 100644
--- a/src/maasserver/migrations/maasserver/0057_initial_dns_publication.py
+++ b/src/maasserver/migrations/maasserver/0057_initial_dns_publication.py
@@ -22,7 +22,6 @@ def remove_initial_publication(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0056_zone_serial_ownership")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0057_merge.py b/src/maasserver/migrations/maasserver/0057_merge.py
index 2c2650e..6c5654f 100644
--- a/src/maasserver/migrations/maasserver/0057_merge.py
+++ b/src/maasserver/migrations/maasserver/0057_merge.py
@@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0056_add_description_to_fabric_and_space"),
("maasserver", "0056_zone_serial_ownership"),
diff --git a/src/maasserver/migrations/maasserver/0058_bigger_integer_for_dns_publication_serial.py b/src/maasserver/migrations/maasserver/0058_bigger_integer_for_dns_publication_serial.py
index 58bec9b..ec6741c 100644
--- a/src/maasserver/migrations/maasserver/0058_bigger_integer_for_dns_publication_serial.py
+++ b/src/maasserver/migrations/maasserver/0058_bigger_integer_for_dns_publication_serial.py
@@ -5,7 +5,6 @@ import maasserver.models.dnspublication
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0057_initial_dns_publication")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0059_merge.py b/src/maasserver/migrations/maasserver/0059_merge.py
index 31d4f76..182e42e 100644
--- a/src/maasserver/migrations/maasserver/0059_merge.py
+++ b/src/maasserver/migrations/maasserver/0059_merge.py
@@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0058_bigger_integer_for_dns_publication_serial"),
("maasserver", "0057_merge"),
diff --git a/src/maasserver/migrations/maasserver/0060_amt_remove_mac_address.py b/src/maasserver/migrations/maasserver/0060_amt_remove_mac_address.py
index b8cffb2..13205b7 100644
--- a/src/maasserver/migrations/maasserver/0060_amt_remove_mac_address.py
+++ b/src/maasserver/migrations/maasserver/0060_amt_remove_mac_address.py
@@ -9,7 +9,6 @@ def amt_remove_mac_address(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0059_merge")]
operations = [migrations.RunPython(amt_remove_mac_address)]
diff --git a/src/maasserver/migrations/maasserver/0061_maas_nodegroup_worker_to_maas.py b/src/maasserver/migrations/maasserver/0061_maas_nodegroup_worker_to_maas.py
index e569c78..958bb3a 100644
--- a/src/maasserver/migrations/maasserver/0061_maas_nodegroup_worker_to_maas.py
+++ b/src/maasserver/migrations/maasserver/0061_maas_nodegroup_worker_to_maas.py
@@ -12,7 +12,6 @@ def maas_nodegroup_worker_to_maas(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0060_amt_remove_mac_address")]
operations = [migrations.RunPython(maas_nodegroup_worker_to_maas)]
diff --git a/src/maasserver/migrations/maasserver/0062_fix_bootsource_daily_label.py b/src/maasserver/migrations/maasserver/0062_fix_bootsource_daily_label.py
index 2518bb0..9fa8990 100644
--- a/src/maasserver/migrations/maasserver/0062_fix_bootsource_daily_label.py
+++ b/src/maasserver/migrations/maasserver/0062_fix_bootsource_daily_label.py
@@ -14,7 +14,6 @@ def fix_bootsource_daily_label(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0061_maas_nodegroup_worker_to_maas")]
operations = [migrations.RunPython(fix_bootsource_daily_label)]
diff --git a/src/maasserver/migrations/maasserver/0063_remove_orphaned_bmcs_and_ips.py b/src/maasserver/migrations/maasserver/0063_remove_orphaned_bmcs_and_ips.py
index f3df4e7..2069291 100644
--- a/src/maasserver/migrations/maasserver/0063_remove_orphaned_bmcs_and_ips.py
+++ b/src/maasserver/migrations/maasserver/0063_remove_orphaned_bmcs_and_ips.py
@@ -10,7 +10,6 @@ def remove_orphaned_bmcs(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0062_fix_bootsource_daily_label")]
operations = [migrations.RunPython(remove_orphaned_bmcs)]
diff --git a/src/maasserver/migrations/maasserver/0064_remove_unneeded_event_triggers.py b/src/maasserver/migrations/maasserver/0064_remove_unneeded_event_triggers.py
index 5fdbddd..02ac12b 100644
--- a/src/maasserver/migrations/maasserver/0064_remove_unneeded_event_triggers.py
+++ b/src/maasserver/migrations/maasserver/0064_remove_unneeded_event_triggers.py
@@ -14,7 +14,6 @@ def remove_unneeded_event_triggers(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0063_remove_orphaned_bmcs_and_ips")]
operations = [migrations.RunPython(remove_unneeded_event_triggers)]
diff --git a/src/maasserver/migrations/maasserver/0065_larger_osystem_and_distro_series.py b/src/maasserver/migrations/maasserver/0065_larger_osystem_and_distro_series.py
index f3549e2..c31039b 100644
--- a/src/maasserver/migrations/maasserver/0065_larger_osystem_and_distro_series.py
+++ b/src/maasserver/migrations/maasserver/0065_larger_osystem_and_distro_series.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0064_remove_unneeded_event_triggers")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0066_allow_squashfs.py b/src/maasserver/migrations/maasserver/0066_allow_squashfs.py
index 9773bd9..33625bf 100644
--- a/src/maasserver/migrations/maasserver/0066_allow_squashfs.py
+++ b/src/maasserver/migrations/maasserver/0066_allow_squashfs.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0065_larger_osystem_and_distro_series")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0067_add_size_to_largefile.py b/src/maasserver/migrations/maasserver/0067_add_size_to_largefile.py
index c72d125..626d379 100644
--- a/src/maasserver/migrations/maasserver/0067_add_size_to_largefile.py
+++ b/src/maasserver/migrations/maasserver/0067_add_size_to_largefile.py
@@ -17,7 +17,6 @@ def set_size_on_all_largefiles(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0066_allow_squashfs")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0068_drop_node_system_id_sequence.py b/src/maasserver/migrations/maasserver/0068_drop_node_system_id_sequence.py
index 514844e..4fc7212 100644
--- a/src/maasserver/migrations/maasserver/0068_drop_node_system_id_sequence.py
+++ b/src/maasserver/migrations/maasserver/0068_drop_node_system_id_sequence.py
@@ -28,7 +28,6 @@ sequence_drop = "DROP SEQUENCE IF EXISTS maasserver_node_system_id_seq"
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0067_add_size_to_largefile")]
operations = [migrations.RunSQL(sequence_drop, sequence_create)]
diff --git a/src/maasserver/migrations/maasserver/0069_add_previous_node_status_to_node.py b/src/maasserver/migrations/maasserver/0069_add_previous_node_status_to_node.py
index 74139f7..d63e849 100644
--- a/src/maasserver/migrations/maasserver/0069_add_previous_node_status_to_node.py
+++ b/src/maasserver/migrations/maasserver/0069_add_previous_node_status_to_node.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0068_drop_node_system_id_sequence")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0070_allow_null_vlan_on_interface.py b/src/maasserver/migrations/maasserver/0070_allow_null_vlan_on_interface.py
index 5fc61b2..f563752 100644
--- a/src/maasserver/migrations/maasserver/0070_allow_null_vlan_on_interface.py
+++ b/src/maasserver/migrations/maasserver/0070_allow_null_vlan_on_interface.py
@@ -3,7 +3,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0069_add_previous_node_status_to_node")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0071_ntp_server_to_ntp_servers.py b/src/maasserver/migrations/maasserver/0071_ntp_server_to_ntp_servers.py
index 293a313..37e6cb8 100644
--- a/src/maasserver/migrations/maasserver/0071_ntp_server_to_ntp_servers.py
+++ b/src/maasserver/migrations/maasserver/0071_ntp_server_to_ntp_servers.py
@@ -14,7 +14,6 @@ UPDATE maasserver_config
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0070_allow_null_vlan_on_interface")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0072_packagerepository.py b/src/maasserver/migrations/maasserver/0072_packagerepository.py
index f6f0fd2..7e63276 100644
--- a/src/maasserver/migrations/maasserver/0072_packagerepository.py
+++ b/src/maasserver/migrations/maasserver/0072_packagerepository.py
@@ -5,7 +5,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0071_ntp_server_to_ntp_servers")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0072_update_status_and_previous_status.py b/src/maasserver/migrations/maasserver/0072_update_status_and_previous_status.py
index 99b9991..6f0f08d 100644
--- a/src/maasserver/migrations/maasserver/0072_update_status_and_previous_status.py
+++ b/src/maasserver/migrations/maasserver/0072_update_status_and_previous_status.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0071_ntp_server_to_ntp_servers")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0073_migrate_package_repositories.py b/src/maasserver/migrations/maasserver/0073_migrate_package_repositories.py
index 97923b7..d6e4953 100644
--- a/src/maasserver/migrations/maasserver/0073_migrate_package_repositories.py
+++ b/src/maasserver/migrations/maasserver/0073_migrate_package_repositories.py
@@ -66,7 +66,6 @@ def move_package_repositories(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0072_packagerepository")]
operations = [migrations.RunPython(move_package_repositories)]
diff --git a/src/maasserver/migrations/maasserver/0074_merge.py b/src/maasserver/migrations/maasserver/0074_merge.py
index b91d23d..6991eea 100644
--- a/src/maasserver/migrations/maasserver/0074_merge.py
+++ b/src/maasserver/migrations/maasserver/0074_merge.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0072_update_status_and_previous_status"),
("maasserver", "0073_migrate_package_repositories"),
diff --git a/src/maasserver/migrations/maasserver/0075_modify_packagerepository.py b/src/maasserver/migrations/maasserver/0075_modify_packagerepository.py
index 7bcb89d..f9b7bd9 100644
--- a/src/maasserver/migrations/maasserver/0075_modify_packagerepository.py
+++ b/src/maasserver/migrations/maasserver/0075_modify_packagerepository.py
@@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0074_merge")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0076_interface_discovery_rescue_mode.py b/src/maasserver/migrations/maasserver/0076_interface_discovery_rescue_mode.py
index b14994a..7ac37ef 100644
--- a/src/maasserver/migrations/maasserver/0076_interface_discovery_rescue_mode.py
+++ b/src/maasserver/migrations/maasserver/0076_interface_discovery_rescue_mode.py
@@ -7,7 +7,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0075_modify_packagerepository")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0077_static_routes.py b/src/maasserver/migrations/maasserver/0077_static_routes.py
index 3085ab4..c9786e7 100644
--- a/src/maasserver/migrations/maasserver/0077_static_routes.py
+++ b/src/maasserver/migrations/maasserver/0077_static_routes.py
@@ -5,7 +5,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0076_interface_discovery_rescue_mode")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0078_remove_packagerepository_description.py b/src/maasserver/migrations/maasserver/0078_remove_packagerepository_description.py
index 5093f0f..0f543a2 100644
--- a/src/maasserver/migrations/maasserver/0078_remove_packagerepository_description.py
+++ b/src/maasserver/migrations/maasserver/0078_remove_packagerepository_description.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0077_static_routes")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0079_add_keysource_model.py b/src/maasserver/migrations/maasserver/0079_add_keysource_model.py
index e9ffe0b..ab690a5 100644
--- a/src/maasserver/migrations/maasserver/0079_add_keysource_model.py
+++ b/src/maasserver/migrations/maasserver/0079_add_keysource_model.py
@@ -5,7 +5,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0078_remove_packagerepository_description")
]
diff --git a/src/maasserver/migrations/maasserver/0080_change_packagerepository_url_type.py b/src/maasserver/migrations/maasserver/0080_change_packagerepository_url_type.py
index b144200..f233d53 100644
--- a/src/maasserver/migrations/maasserver/0080_change_packagerepository_url_type.py
+++ b/src/maasserver/migrations/maasserver/0080_change_packagerepository_url_type.py
@@ -4,7 +4,6 @@ import maasserver.fields
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0079_add_keysource_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0081_allow_larger_bootsourcecache_fields.py b/src/maasserver/migrations/maasserver/0081_allow_larger_bootsourcecache_fields.py
index 6d8f389..4ca2a92 100644
--- a/src/maasserver/migrations/maasserver/0081_allow_larger_bootsourcecache_fields.py
+++ b/src/maasserver/migrations/maasserver/0081_allow_larger_bootsourcecache_fields.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0080_change_packagerepository_url_type")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0082_add_kflavor.py b/src/maasserver/migrations/maasserver/0082_add_kflavor.py
index ce787aa..04e36a3 100644
--- a/src/maasserver/migrations/maasserver/0082_add_kflavor.py
+++ b/src/maasserver/migrations/maasserver/0082_add_kflavor.py
@@ -20,7 +20,6 @@ def add_kflavor_to_boot_source_cache(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0081_allow_larger_bootsourcecache_fields")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0083_device_discovery.py b/src/maasserver/migrations/maasserver/0083_device_discovery.py
index 41ec181..39a1b04 100644
--- a/src/maasserver/migrations/maasserver/0083_device_discovery.py
+++ b/src/maasserver/migrations/maasserver/0083_device_discovery.py
@@ -6,7 +6,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0082_add_kflavor")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0084_add_default_user_to_node_model.py b/src/maasserver/migrations/maasserver/0084_add_default_user_to_node_model.py
index 5d95bd2..9127931 100644
--- a/src/maasserver/migrations/maasserver/0084_add_default_user_to_node_model.py
+++ b/src/maasserver/migrations/maasserver/0084_add_default_user_to_node_model.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0083_device_discovery")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0085_no_intro_on_upgrade.py b/src/maasserver/migrations/maasserver/0085_no_intro_on_upgrade.py
index 261e532..9be7243 100644
--- a/src/maasserver/migrations/maasserver/0085_no_intro_on_upgrade.py
+++ b/src/maasserver/migrations/maasserver/0085_no_intro_on_upgrade.py
@@ -17,7 +17,6 @@ def no_intro_on_upgrade(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0084_add_default_user_to_node_model")]
operations = [migrations.RunPython(no_intro_on_upgrade)]
diff --git a/src/maasserver/migrations/maasserver/0086_remove_powerpc_from_ports_arches.py b/src/maasserver/migrations/maasserver/0086_remove_powerpc_from_ports_arches.py
index 97840c9..f7fc09c 100644
--- a/src/maasserver/migrations/maasserver/0086_remove_powerpc_from_ports_arches.py
+++ b/src/maasserver/migrations/maasserver/0086_remove_powerpc_from_ports_arches.py
@@ -13,7 +13,6 @@ def remove_powerpc_from_ports_arches(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0085_no_intro_on_upgrade")]
operations = [migrations.RunPython(remove_powerpc_from_ports_arches)]
diff --git a/src/maasserver/migrations/maasserver/0087_add_completed_intro_to_userprofile.py b/src/maasserver/migrations/maasserver/0087_add_completed_intro_to_userprofile.py
index c73da2c..c99de5c 100644
--- a/src/maasserver/migrations/maasserver/0087_add_completed_intro_to_userprofile.py
+++ b/src/maasserver/migrations/maasserver/0087_add_completed_intro_to_userprofile.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0086_remove_powerpc_from_ports_arches")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0088_remove_node_disable_ipv4.py b/src/maasserver/migrations/maasserver/0088_remove_node_disable_ipv4.py
index 9b53339..fe0387e 100644
--- a/src/maasserver/migrations/maasserver/0088_remove_node_disable_ipv4.py
+++ b/src/maasserver/migrations/maasserver/0088_remove_node_disable_ipv4.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0087_add_completed_intro_to_userprofile")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0089_active_discovery.py b/src/maasserver/migrations/maasserver/0089_active_discovery.py
index 2191563..7b892cb 100644
--- a/src/maasserver/migrations/maasserver/0089_active_discovery.py
+++ b/src/maasserver/migrations/maasserver/0089_active_discovery.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0088_remove_node_disable_ipv4")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0090_bootloaders.py b/src/maasserver/migrations/maasserver/0090_bootloaders.py
index 56fecfe..d9fccf2 100644
--- a/src/maasserver/migrations/maasserver/0090_bootloaders.py
+++ b/src/maasserver/migrations/maasserver/0090_bootloaders.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0089_active_discovery")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0091_v2_to_v3.py b/src/maasserver/migrations/maasserver/0091_v2_to_v3.py
index dcbabc7..825d974 100644
--- a/src/maasserver/migrations/maasserver/0091_v2_to_v3.py
+++ b/src/maasserver/migrations/maasserver/0091_v2_to_v3.py
@@ -13,7 +13,6 @@ def v2_to_v3(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0090_bootloaders")]
operations = [migrations.RunPython(v2_to_v3)]
diff --git a/src/maasserver/migrations/maasserver/0092_rolling.py b/src/maasserver/migrations/maasserver/0092_rolling.py
index 30241dd..25cc8be 100644
--- a/src/maasserver/migrations/maasserver/0092_rolling.py
+++ b/src/maasserver/migrations/maasserver/0092_rolling.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0091_v2_to_v3")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0093_add_rdns_model.py b/src/maasserver/migrations/maasserver/0093_add_rdns_model.py
index e3bc18a..824fe98 100644
--- a/src/maasserver/migrations/maasserver/0093_add_rdns_model.py
+++ b/src/maasserver/migrations/maasserver/0093_add_rdns_model.py
@@ -6,7 +6,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0092_rolling")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0094_add_unmanaged_subnets.py b/src/maasserver/migrations/maasserver/0094_add_unmanaged_subnets.py
index 405fa6c..5aaae01 100644
--- a/src/maasserver/migrations/maasserver/0094_add_unmanaged_subnets.py
+++ b/src/maasserver/migrations/maasserver/0094_add_unmanaged_subnets.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0093_add_rdns_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0095_vlan_relay_vlan.py b/src/maasserver/migrations/maasserver/0095_vlan_relay_vlan.py
index f2d83df..14f9f8a 100644
--- a/src/maasserver/migrations/maasserver/0095_vlan_relay_vlan.py
+++ b/src/maasserver/migrations/maasserver/0095_vlan_relay_vlan.py
@@ -3,7 +3,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0094_add_unmanaged_subnets")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0096_set_default_vlan_field.py b/src/maasserver/migrations/maasserver/0096_set_default_vlan_field.py
index f2b7ded..608d6c8 100644
--- a/src/maasserver/migrations/maasserver/0096_set_default_vlan_field.py
+++ b/src/maasserver/migrations/maasserver/0096_set_default_vlan_field.py
@@ -3,7 +3,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0095_vlan_relay_vlan")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0097_node_chassis_storage_hints.py b/src/maasserver/migrations/maasserver/0097_node_chassis_storage_hints.py
index 1ce89b0..4a06319 100644
--- a/src/maasserver/migrations/maasserver/0097_node_chassis_storage_hints.py
+++ b/src/maasserver/migrations/maasserver/0097_node_chassis_storage_hints.py
@@ -6,7 +6,6 @@ import maasserver.models.node
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0096_set_default_vlan_field")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0098_add_space_to_vlan.py b/src/maasserver/migrations/maasserver/0098_add_space_to_vlan.py
index f3729a6..61892a5 100644
--- a/src/maasserver/migrations/maasserver/0098_add_space_to_vlan.py
+++ b/src/maasserver/migrations/maasserver/0098_add_space_to_vlan.py
@@ -5,7 +5,6 @@ import maasserver.models.subnet
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0097_node_chassis_storage_hints")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0099_set_default_vlan_field.py b/src/maasserver/migrations/maasserver/0099_set_default_vlan_field.py
index a8dfb47..0db9fd3 100644
--- a/src/maasserver/migrations/maasserver/0099_set_default_vlan_field.py
+++ b/src/maasserver/migrations/maasserver/0099_set_default_vlan_field.py
@@ -5,7 +5,6 @@ import maasserver.models.subnet
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0098_add_space_to_vlan")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0100_migrate_spaces_from_subnet_to_vlan.py b/src/maasserver/migrations/maasserver/0100_migrate_spaces_from_subnet_to_vlan.py
index 24ddccc..86bd7bc 100644
--- a/src/maasserver/migrations/maasserver/0100_migrate_spaces_from_subnet_to_vlan.py
+++ b/src/maasserver/migrations/maasserver/0100_migrate_spaces_from_subnet_to_vlan.py
@@ -34,7 +34,6 @@ def migrate_spaces_from_subnet_to_vlan(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0099_set_default_vlan_field")]
operations = [migrations.RunPython(migrate_spaces_from_subnet_to_vlan)]
diff --git a/src/maasserver/migrations/maasserver/0101_filesystem_btrfs_support.py b/src/maasserver/migrations/maasserver/0101_filesystem_btrfs_support.py
index 73edffa..7f33c37 100644
--- a/src/maasserver/migrations/maasserver/0101_filesystem_btrfs_support.py
+++ b/src/maasserver/migrations/maasserver/0101_filesystem_btrfs_support.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0100_migrate_spaces_from_subnet_to_vlan")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0102_remove_space_from_subnet.py b/src/maasserver/migrations/maasserver/0102_remove_space_from_subnet.py
index f426ecf..487e017 100644
--- a/src/maasserver/migrations/maasserver/0102_remove_space_from_subnet.py
+++ b/src/maasserver/migrations/maasserver/0102_remove_space_from_subnet.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0101_filesystem_btrfs_support")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0103_notifications.py b/src/maasserver/migrations/maasserver/0103_notifications.py
index 5a1e3e7..870cc08 100644
--- a/src/maasserver/migrations/maasserver/0103_notifications.py
+++ b/src/maasserver/migrations/maasserver/0103_notifications.py
@@ -7,7 +7,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("maasserver", "0102_remove_space_from_subnet"),
diff --git a/src/maasserver/migrations/maasserver/0104_notifications_dismissals.py b/src/maasserver/migrations/maasserver/0104_notifications_dismissals.py
index a57f02f..4d6edc4 100644
--- a/src/maasserver/migrations/maasserver/0104_notifications_dismissals.py
+++ b/src/maasserver/migrations/maasserver/0104_notifications_dismissals.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("maasserver", "0103_notifications"),
diff --git a/src/maasserver/migrations/maasserver/0105_add_script_sets_to_node_model.py b/src/maasserver/migrations/maasserver/0105_add_script_sets_to_node_model.py
index c7ba0e6..5310e6a 100644
--- a/src/maasserver/migrations/maasserver/0105_add_script_sets_to_node_model.py
+++ b/src/maasserver/migrations/maasserver/0105_add_script_sets_to_node_model.py
@@ -3,7 +3,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0002_script_models"),
("maasserver", "0104_notifications_dismissals"),
diff --git a/src/maasserver/migrations/maasserver/0106_testing_status.py b/src/maasserver/migrations/maasserver/0106_testing_status.py
index e7665df..1a251a5 100644
--- a/src/maasserver/migrations/maasserver/0106_testing_status.py
+++ b/src/maasserver/migrations/maasserver/0106_testing_status.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0105_add_script_sets_to_node_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0107_chassis_to_pods.py b/src/maasserver/migrations/maasserver/0107_chassis_to_pods.py
index 202f906..6f775a5 100644
--- a/src/maasserver/migrations/maasserver/0107_chassis_to_pods.py
+++ b/src/maasserver/migrations/maasserver/0107_chassis_to_pods.py
@@ -5,7 +5,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0106_testing_status")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0108_generate_bmc_names.py b/src/maasserver/migrations/maasserver/0108_generate_bmc_names.py
index c0897ed..7d70420 100644
--- a/src/maasserver/migrations/maasserver/0108_generate_bmc_names.py
+++ b/src/maasserver/migrations/maasserver/0108_generate_bmc_names.py
@@ -15,7 +15,6 @@ def generate_bmc_names(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0107_chassis_to_pods")]
operations = [migrations.RunPython(generate_bmc_names)]
diff --git a/src/maasserver/migrations/maasserver/0109_bmc_names_unique.py b/src/maasserver/migrations/maasserver/0109_bmc_names_unique.py
index 60c45bd..a6fc8a0 100644
--- a/src/maasserver/migrations/maasserver/0109_bmc_names_unique.py
+++ b/src/maasserver/migrations/maasserver/0109_bmc_names_unique.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0108_generate_bmc_names")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0110_notification_category.py b/src/maasserver/migrations/maasserver/0110_notification_category.py
index c33917f..0cc161e 100644
--- a/src/maasserver/migrations/maasserver/0110_notification_category.py
+++ b/src/maasserver/migrations/maasserver/0110_notification_category.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0109_bmc_names_unique")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0111_remove_component_error.py b/src/maasserver/migrations/maasserver/0111_remove_component_error.py
index c81dabe..e8c9a50 100644
--- a/src/maasserver/migrations/maasserver/0111_remove_component_error.py
+++ b/src/maasserver/migrations/maasserver/0111_remove_component_error.py
@@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0110_notification_category")]
operations = [migrations.DeleteModel(name="ComponentError")]
diff --git a/src/maasserver/migrations/maasserver/0112_update_notification.py b/src/maasserver/migrations/maasserver/0112_update_notification.py
index 84c1413..0202674 100644
--- a/src/maasserver/migrations/maasserver/0112_update_notification.py
+++ b/src/maasserver/migrations/maasserver/0112_update_notification.py
@@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0111_remove_component_error")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0113_set_filepath_limit_to_linux_max.py b/src/maasserver/migrations/maasserver/0113_set_filepath_limit_to_linux_max.py
index 8687419..9f7025f 100644
--- a/src/maasserver/migrations/maasserver/0113_set_filepath_limit_to_linux_max.py
+++ b/src/maasserver/migrations/maasserver/0113_set_filepath_limit_to_linux_max.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0112_update_notification")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0114_node_dynamic_to_creation_type.py b/src/maasserver/migrations/maasserver/0114_node_dynamic_to_creation_type.py
index 1607186..9456403 100644
--- a/src/maasserver/migrations/maasserver/0114_node_dynamic_to_creation_type.py
+++ b/src/maasserver/migrations/maasserver/0114_node_dynamic_to_creation_type.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0113_set_filepath_limit_to_linux_max")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0115_additional_boot_resource_filetypes.py b/src/maasserver/migrations/maasserver/0115_additional_boot_resource_filetypes.py
index 1404d5d..044a9a4 100644
--- a/src/maasserver/migrations/maasserver/0115_additional_boot_resource_filetypes.py
+++ b/src/maasserver/migrations/maasserver/0115_additional_boot_resource_filetypes.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0114_node_dynamic_to_creation_type")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0116_add_disabled_components_for_mirrors.py b/src/maasserver/migrations/maasserver/0116_add_disabled_components_for_mirrors.py
index 200d69b..9d3c1f0 100644
--- a/src/maasserver/migrations/maasserver/0116_add_disabled_components_for_mirrors.py
+++ b/src/maasserver/migrations/maasserver/0116_add_disabled_components_for_mirrors.py
@@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0115_additional_boot_resource_filetypes")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0117_add_iscsi_block_device.py b/src/maasserver/migrations/maasserver/0117_add_iscsi_block_device.py
index 98d540d..4ccd0b0 100644
--- a/src/maasserver/migrations/maasserver/0117_add_iscsi_block_device.py
+++ b/src/maasserver/migrations/maasserver/0117_add_iscsi_block_device.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0116_add_disabled_components_for_mirrors")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0118_add_iscsi_storage_pod.py b/src/maasserver/migrations/maasserver/0118_add_iscsi_storage_pod.py
index 712464b..ac85ba8 100644
--- a/src/maasserver/migrations/maasserver/0118_add_iscsi_storage_pod.py
+++ b/src/maasserver/migrations/maasserver/0118_add_iscsi_storage_pod.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0117_add_iscsi_block_device")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0119_set_default_vlan_field.py b/src/maasserver/migrations/maasserver/0119_set_default_vlan_field.py
index fa43bd4..715f14c 100644
--- a/src/maasserver/migrations/maasserver/0119_set_default_vlan_field.py
+++ b/src/maasserver/migrations/maasserver/0119_set_default_vlan_field.py
@@ -2,7 +2,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0118_add_iscsi_storage_pod")]
# convert this to a no-op as it was previously updating the Subnet.vlan
diff --git a/src/maasserver/migrations/maasserver/0120_bootsourcecache_extra.py b/src/maasserver/migrations/maasserver/0120_bootsourcecache_extra.py
index 2c57f34..bff386d 100644
--- a/src/maasserver/migrations/maasserver/0120_bootsourcecache_extra.py
+++ b/src/maasserver/migrations/maasserver/0120_bootsourcecache_extra.py
@@ -4,7 +4,6 @@ import maasserver.migrations.fields
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0119_set_default_vlan_field")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0121_relax_staticipaddress_unique_constraint.py b/src/maasserver/migrations/maasserver/0121_relax_staticipaddress_unique_constraint.py
index 8128b1c..a80353b 100644
--- a/src/maasserver/migrations/maasserver/0121_relax_staticipaddress_unique_constraint.py
+++ b/src/maasserver/migrations/maasserver/0121_relax_staticipaddress_unique_constraint.py
@@ -11,7 +11,6 @@ staticipaddress_unique_index_create = (
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0120_bootsourcecache_extra")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0122_make_virtualblockdevice_uuid_editable.py b/src/maasserver/migrations/maasserver/0122_make_virtualblockdevice_uuid_editable.py
index 671bb9d..4b363c1 100644
--- a/src/maasserver/migrations/maasserver/0122_make_virtualblockdevice_uuid_editable.py
+++ b/src/maasserver/migrations/maasserver/0122_make_virtualblockdevice_uuid_editable.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0121_relax_staticipaddress_unique_constraint")
]
diff --git a/src/maasserver/migrations/maasserver/0123_make_iprange_comment_default_to_empty_string.py b/src/maasserver/migrations/maasserver/0123_make_iprange_comment_default_to_empty_string.py
index a1ad39e..eaffe41 100644
--- a/src/maasserver/migrations/maasserver/0123_make_iprange_comment_default_to_empty_string.py
+++ b/src/maasserver/migrations/maasserver/0123_make_iprange_comment_default_to_empty_string.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0122_make_virtualblockdevice_uuid_editable")
]
diff --git a/src/maasserver/migrations/maasserver/0124_staticipaddress_address_family_index.py b/src/maasserver/migrations/maasserver/0124_staticipaddress_address_family_index.py
index 1d03213..361743e 100644
--- a/src/maasserver/migrations/maasserver/0124_staticipaddress_address_family_index.py
+++ b/src/maasserver/migrations/maasserver/0124_staticipaddress_address_family_index.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0123_make_iprange_comment_default_to_empty_string")
]
diff --git a/src/maasserver/migrations/maasserver/0125_add_switch_model.py b/src/maasserver/migrations/maasserver/0125_add_switch_model.py
index b0875dc..f8c46fd 100644
--- a/src/maasserver/migrations/maasserver/0125_add_switch_model.py
+++ b/src/maasserver/migrations/maasserver/0125_add_switch_model.py
@@ -5,7 +5,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0124_staticipaddress_address_family_index")
]
diff --git a/src/maasserver/migrations/maasserver/0126_add_controllerinfo_model.py b/src/maasserver/migrations/maasserver/0126_add_controllerinfo_model.py
index a7f1988..98cd07f 100644
--- a/src/maasserver/migrations/maasserver/0126_add_controllerinfo_model.py
+++ b/src/maasserver/migrations/maasserver/0126_add_controllerinfo_model.py
@@ -5,7 +5,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0125_add_switch_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0127_nodemetadata.py b/src/maasserver/migrations/maasserver/0127_nodemetadata.py
index f056c0d..95e116b 100644
--- a/src/maasserver/migrations/maasserver/0127_nodemetadata.py
+++ b/src/maasserver/migrations/maasserver/0127_nodemetadata.py
@@ -4,7 +4,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0126_add_controllerinfo_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0128_events_created_index.py b/src/maasserver/migrations/maasserver/0128_events_created_index.py
index 10754e1..3c36d24 100644
--- a/src/maasserver/migrations/maasserver/0128_events_created_index.py
+++ b/src/maasserver/migrations/maasserver/0128_events_created_index.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0127_nodemetadata")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0129_add_install_rackd_flag.py b/src/maasserver/migrations/maasserver/0129_add_install_rackd_flag.py
index 81d31b0..67048eb 100644
--- a/src/maasserver/migrations/maasserver/0129_add_install_rackd_flag.py
+++ b/src/maasserver/migrations/maasserver/0129_add_install_rackd_flag.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0128_events_created_index")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0130_node_locked_flag.py b/src/maasserver/migrations/maasserver/0130_node_locked_flag.py
index aec311d..f946a27 100644
--- a/src/maasserver/migrations/maasserver/0130_node_locked_flag.py
+++ b/src/maasserver/migrations/maasserver/0130_node_locked_flag.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0129_add_install_rackd_flag")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0131_update_event_model_for_audit_logs.py b/src/maasserver/migrations/maasserver/0131_update_event_model_for_audit_logs.py
index f0528ee..4fc4ec9 100644
--- a/src/maasserver/migrations/maasserver/0131_update_event_model_for_audit_logs.py
+++ b/src/maasserver/migrations/maasserver/0131_update_event_model_for_audit_logs.py
@@ -6,7 +6,6 @@ import maasserver.utils.dns
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("maasserver", "0130_node_locked_flag"),
diff --git a/src/maasserver/migrations/maasserver/0132_consistent_model_name_validation.py b/src/maasserver/migrations/maasserver/0132_consistent_model_name_validation.py
index b043bb7..5505ef8 100644
--- a/src/maasserver/migrations/maasserver/0132_consistent_model_name_validation.py
+++ b/src/maasserver/migrations/maasserver/0132_consistent_model_name_validation.py
@@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0131_update_event_model_for_audit_logs")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0133_add_resourcepool_model.py b/src/maasserver/migrations/maasserver/0133_add_resourcepool_model.py
index 0ba7c4c..565dd47 100644
--- a/src/maasserver/migrations/maasserver/0133_add_resourcepool_model.py
+++ b/src/maasserver/migrations/maasserver/0133_add_resourcepool_model.py
@@ -5,7 +5,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0132_consistent_model_name_validation")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0134_create_default_resourcepool.py b/src/maasserver/migrations/maasserver/0134_create_default_resourcepool.py
index 97f5977..37f5a8c 100644
--- a/src/maasserver/migrations/maasserver/0134_create_default_resourcepool.py
+++ b/src/maasserver/migrations/maasserver/0134_create_default_resourcepool.py
@@ -23,7 +23,6 @@ def forwards(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0133_add_resourcepool_model")]
operations = [migrations.RunPython(forwards)]
diff --git a/src/maasserver/migrations/maasserver/0135_add_pool_reference_to_node.py b/src/maasserver/migrations/maasserver/0135_add_pool_reference_to_node.py
index f52ee85..375ce35 100644
--- a/src/maasserver/migrations/maasserver/0135_add_pool_reference_to_node.py
+++ b/src/maasserver/migrations/maasserver/0135_add_pool_reference_to_node.py
@@ -11,7 +11,6 @@ def set_machines_default_resource_pool(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0134_create_default_resourcepool")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0136_add_user_role_models.py b/src/maasserver/migrations/maasserver/0136_add_user_role_models.py
index 6006a52..f9fd99d 100644
--- a/src/maasserver/migrations/maasserver/0136_add_user_role_models.py
+++ b/src/maasserver/migrations/maasserver/0136_add_user_role_models.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("maasserver", "0135_add_pool_reference_to_node"),
diff --git a/src/maasserver/migrations/maasserver/0137_create_default_roles.py b/src/maasserver/migrations/maasserver/0137_create_default_roles.py
index bd1f715..dbc2004 100644
--- a/src/maasserver/migrations/maasserver/0137_create_default_roles.py
+++ b/src/maasserver/migrations/maasserver/0137_create_default_roles.py
@@ -24,7 +24,6 @@ def forwards(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("maasserver", "0136_add_user_role_models"),
diff --git a/src/maasserver/migrations/maasserver/0138_add_ip_and_user_agent_to_event_model.py b/src/maasserver/migrations/maasserver/0138_add_ip_and_user_agent_to_event_model.py
index ab3ce9b..d4bce45 100644
--- a/src/maasserver/migrations/maasserver/0138_add_ip_and_user_agent_to_event_model.py
+++ b/src/maasserver/migrations/maasserver/0138_add_ip_and_user_agent_to_event_model.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0137_create_default_roles")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0139_add_endpoint_and_increase_user_agent_length_for_event.py b/src/maasserver/migrations/maasserver/0139_add_endpoint_and_increase_user_agent_length_for_event.py
index 2be9707..5782db5 100644
--- a/src/maasserver/migrations/maasserver/0139_add_endpoint_and_increase_user_agent_length_for_event.py
+++ b/src/maasserver/migrations/maasserver/0139_add_endpoint_and_increase_user_agent_length_for_event.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0138_add_ip_and_user_agent_to_event_model")
]
diff --git a/src/maasserver/migrations/maasserver/0140_add_usergroup_model.py b/src/maasserver/migrations/maasserver/0140_add_usergroup_model.py
index 66d2e85..eabd575 100644
--- a/src/maasserver/migrations/maasserver/0140_add_usergroup_model.py
+++ b/src/maasserver/migrations/maasserver/0140_add_usergroup_model.py
@@ -9,7 +9,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
(
diff --git a/src/maasserver/migrations/maasserver/0141_add_default_usergroup.py b/src/maasserver/migrations/maasserver/0141_add_default_usergroup.py
index 8f5202f..580f830 100644
--- a/src/maasserver/migrations/maasserver/0141_add_default_usergroup.py
+++ b/src/maasserver/migrations/maasserver/0141_add_default_usergroup.py
@@ -30,7 +30,6 @@ def forwards(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0140_add_usergroup_model")]
operations = [migrations.RunPython(forwards)]
diff --git a/src/maasserver/migrations/maasserver/0142_pod_default_resource_pool.py b/src/maasserver/migrations/maasserver/0142_pod_default_resource_pool.py
index c288257..b4e4994 100644
--- a/src/maasserver/migrations/maasserver/0142_pod_default_resource_pool.py
+++ b/src/maasserver/migrations/maasserver/0142_pod_default_resource_pool.py
@@ -13,7 +13,6 @@ def set_pod_default_resource_pool(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0141_add_default_usergroup")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0143_blockdevice_firmware.py b/src/maasserver/migrations/maasserver/0143_blockdevice_firmware.py
index af43c29..4918df1 100644
--- a/src/maasserver/migrations/maasserver/0143_blockdevice_firmware.py
+++ b/src/maasserver/migrations/maasserver/0143_blockdevice_firmware.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0142_pod_default_resource_pool")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0144_filesystem_zfsroot_support.py b/src/maasserver/migrations/maasserver/0144_filesystem_zfsroot_support.py
index 7071c2e..822e15f 100644
--- a/src/maasserver/migrations/maasserver/0144_filesystem_zfsroot_support.py
+++ b/src/maasserver/migrations/maasserver/0144_filesystem_zfsroot_support.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0143_blockdevice_firmware")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0145_interface_firmware.py b/src/maasserver/migrations/maasserver/0145_interface_firmware.py
index af9491c..edde190 100644
--- a/src/maasserver/migrations/maasserver/0145_interface_firmware.py
+++ b/src/maasserver/migrations/maasserver/0145_interface_firmware.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0144_filesystem_zfsroot_support")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0146_add_rootkey.py b/src/maasserver/migrations/maasserver/0146_add_rootkey.py
index 792eb11..c34081e 100644
--- a/src/maasserver/migrations/maasserver/0146_add_rootkey.py
+++ b/src/maasserver/migrations/maasserver/0146_add_rootkey.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0145_interface_firmware")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0147_pod_zones.py b/src/maasserver/migrations/maasserver/0147_pod_zones.py
index 35666e4..a9597c5 100644
--- a/src/maasserver/migrations/maasserver/0147_pod_zones.py
+++ b/src/maasserver/migrations/maasserver/0147_pod_zones.py
@@ -7,7 +7,6 @@ import maasserver.models.node
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0146_add_rootkey")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0148_add_tags_on_pods.py b/src/maasserver/migrations/maasserver/0148_add_tags_on_pods.py
index cfb8d6e..85c05d0 100644
--- a/src/maasserver/migrations/maasserver/0148_add_tags_on_pods.py
+++ b/src/maasserver/migrations/maasserver/0148_add_tags_on_pods.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0147_pod_zones")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0149_userprofile_auth_last_check.py b/src/maasserver/migrations/maasserver/0149_userprofile_auth_last_check.py
index de8419e..cb69d05 100644
--- a/src/maasserver/migrations/maasserver/0149_userprofile_auth_last_check.py
+++ b/src/maasserver/migrations/maasserver/0149_userprofile_auth_last_check.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0148_add_tags_on_pods")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0150_add_pod_commit_ratios.py b/src/maasserver/migrations/maasserver/0150_add_pod_commit_ratios.py
index cefc49a..359e495 100644
--- a/src/maasserver/migrations/maasserver/0150_add_pod_commit_ratios.py
+++ b/src/maasserver/migrations/maasserver/0150_add_pod_commit_ratios.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0149_userprofile_auth_last_check")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0151_userprofile_is_local.py b/src/maasserver/migrations/maasserver/0151_userprofile_is_local.py
index fecccd2..68f54b0 100644
--- a/src/maasserver/migrations/maasserver/0151_userprofile_is_local.py
+++ b/src/maasserver/migrations/maasserver/0151_userprofile_is_local.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0150_add_pod_commit_ratios")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0152_add_usergroup_local.py b/src/maasserver/migrations/maasserver/0152_add_usergroup_local.py
index 7010805..7941145 100644
--- a/src/maasserver/migrations/maasserver/0152_add_usergroup_local.py
+++ b/src/maasserver/migrations/maasserver/0152_add_usergroup_local.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0151_userprofile_is_local")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0153_add_skip_bmc_config.py b/src/maasserver/migrations/maasserver/0153_add_skip_bmc_config.py
index 4679740..0b352ad 100644
--- a/src/maasserver/migrations/maasserver/0153_add_skip_bmc_config.py
+++ b/src/maasserver/migrations/maasserver/0153_add_skip_bmc_config.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0152_add_usergroup_local")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0154_link_usergroup_role.py b/src/maasserver/migrations/maasserver/0154_link_usergroup_role.py
index 7368507..128b77d 100644
--- a/src/maasserver/migrations/maasserver/0154_link_usergroup_role.py
+++ b/src/maasserver/migrations/maasserver/0154_link_usergroup_role.py
@@ -14,7 +14,6 @@ def forwards(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0153_add_skip_bmc_config")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0155_add_globaldefaults_model.py b/src/maasserver/migrations/maasserver/0155_add_globaldefaults_model.py
index 8901e80..7561e8c 100644
--- a/src/maasserver/migrations/maasserver/0155_add_globaldefaults_model.py
+++ b/src/maasserver/migrations/maasserver/0155_add_globaldefaults_model.py
@@ -9,7 +9,6 @@ import maasserver.models.node
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0154_link_usergroup_role")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0156_drop_ssh_unique_key_index.py b/src/maasserver/migrations/maasserver/0156_drop_ssh_unique_key_index.py
index db968ae..d3b876c 100644
--- a/src/maasserver/migrations/maasserver/0156_drop_ssh_unique_key_index.py
+++ b/src/maasserver/migrations/maasserver/0156_drop_ssh_unique_key_index.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0155_add_globaldefaults_model")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0157_drop_usergroup_and_role.py b/src/maasserver/migrations/maasserver/0157_drop_usergroup_and_role.py
index 3977ad4..6f1eee4 100644
--- a/src/maasserver/migrations/maasserver/0157_drop_usergroup_and_role.py
+++ b/src/maasserver/migrations/maasserver/0157_drop_usergroup_and_role.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0156_drop_ssh_unique_key_index")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0158_pod_default_pool_to_pod.py b/src/maasserver/migrations/maasserver/0158_pod_default_pool_to_pod.py
index 49d64d1..86fa281 100644
--- a/src/maasserver/migrations/maasserver/0158_pod_default_pool_to_pod.py
+++ b/src/maasserver/migrations/maasserver/0158_pod_default_pool_to_pod.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0157_drop_usergroup_and_role")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0159_userprofile_auth_last_check_no_now_default.py b/src/maasserver/migrations/maasserver/0159_userprofile_auth_last_check_no_now_default.py
index db8a63a..7210443 100644
--- a/src/maasserver/migrations/maasserver/0159_userprofile_auth_last_check_no_now_default.py
+++ b/src/maasserver/migrations/maasserver/0159_userprofile_auth_last_check_no_now_default.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0158_pod_default_pool_to_pod")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0160_pool_only_for_machines.py b/src/maasserver/migrations/maasserver/0160_pool_only_for_machines.py
index ad856eb..ce99828 100644
--- a/src/maasserver/migrations/maasserver/0160_pool_only_for_machines.py
+++ b/src/maasserver/migrations/maasserver/0160_pool_only_for_machines.py
@@ -12,7 +12,6 @@ def unset_resource_pools_nodes_not_machines(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0159_userprofile_auth_last_check_no_now_default")
]
diff --git a/src/maasserver/migrations/maasserver/0161_pod_storage_pools.py b/src/maasserver/migrations/maasserver/0161_pod_storage_pools.py
index 281f698..86759cb 100644
--- a/src/maasserver/migrations/maasserver/0161_pod_storage_pools.py
+++ b/src/maasserver/migrations/maasserver/0161_pod_storage_pools.py
@@ -7,7 +7,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0160_pool_only_for_machines")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0162_storage_pools_notification.py b/src/maasserver/migrations/maasserver/0162_storage_pools_notification.py
index 8eb06cd..ec2edbc 100644
--- a/src/maasserver/migrations/maasserver/0162_storage_pools_notification.py
+++ b/src/maasserver/migrations/maasserver/0162_storage_pools_notification.py
@@ -29,7 +29,6 @@ def backwards(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0161_pod_storage_pools")]
operations = [migrations.RunPython(forwards, backwards)]
diff --git a/src/maasserver/migrations/maasserver/0163_create_new_power_parameters_with_jsonfield.py b/src/maasserver/migrations/maasserver/0163_create_new_power_parameters_with_jsonfield.py
index 7e325be..384932d 100644
--- a/src/maasserver/migrations/maasserver/0163_create_new_power_parameters_with_jsonfield.py
+++ b/src/maasserver/migrations/maasserver/0163_create_new_power_parameters_with_jsonfield.py
@@ -5,7 +5,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0162_storage_pools_notification")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0164_copy_over_existing_power_parameters.py b/src/maasserver/migrations/maasserver/0164_copy_over_existing_power_parameters.py
index 4e8a818..5a18412 100644
--- a/src/maasserver/migrations/maasserver/0164_copy_over_existing_power_parameters.py
+++ b/src/maasserver/migrations/maasserver/0164_copy_over_existing_power_parameters.py
@@ -15,7 +15,6 @@ def copy_existing_power_parameters(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0163_create_new_power_parameters_with_jsonfield")
]
diff --git a/src/maasserver/migrations/maasserver/0165_remove_and_rename_power_parameters.py b/src/maasserver/migrations/maasserver/0165_remove_and_rename_power_parameters.py
index 8ad6474..ad1f7c4 100644
--- a/src/maasserver/migrations/maasserver/0165_remove_and_rename_power_parameters.py
+++ b/src/maasserver/migrations/maasserver/0165_remove_and_rename_power_parameters.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0164_copy_over_existing_power_parameters")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0166_auto_select_s390x_extra_arches.py b/src/maasserver/migrations/maasserver/0166_auto_select_s390x_extra_arches.py
index 4fac8a5..cbbbafd 100644
--- a/src/maasserver/migrations/maasserver/0166_auto_select_s390x_extra_arches.py
+++ b/src/maasserver/migrations/maasserver/0166_auto_select_s390x_extra_arches.py
@@ -14,7 +14,6 @@ def add_s390x_to_pkg_repository_to_arches(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0165_remove_and_rename_power_parameters")]
operations = [migrations.RunPython(add_s390x_to_pkg_repository_to_arches)]
diff --git a/src/maasserver/migrations/maasserver/0167_add_pod_host.py b/src/maasserver/migrations/maasserver/0167_add_pod_host.py
index 79e46a0..f1fc91f 100644
--- a/src/maasserver/migrations/maasserver/0167_add_pod_host.py
+++ b/src/maasserver/migrations/maasserver/0167_add_pod_host.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0166_auto_select_s390x_extra_arches")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0168_add_pod_default_macvlan_mode.py b/src/maasserver/migrations/maasserver/0168_add_pod_default_macvlan_mode.py
index b480a52..2c6d9db 100644
--- a/src/maasserver/migrations/maasserver/0168_add_pod_default_macvlan_mode.py
+++ b/src/maasserver/migrations/maasserver/0168_add_pod_default_macvlan_mode.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0167_add_pod_host")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0169_find_pod_host.py b/src/maasserver/migrations/maasserver/0169_find_pod_host.py
index eb74d2b..dc0239d 100644
--- a/src/maasserver/migrations/maasserver/0169_find_pod_host.py
+++ b/src/maasserver/migrations/maasserver/0169_find_pod_host.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0168_add_pod_default_macvlan_mode")]
operations = []
diff --git a/src/maasserver/migrations/maasserver/0170_add_subnet_allow_dns.py b/src/maasserver/migrations/maasserver/0170_add_subnet_allow_dns.py
index 5ffb757..a65330a 100644
--- a/src/maasserver/migrations/maasserver/0170_add_subnet_allow_dns.py
+++ b/src/maasserver/migrations/maasserver/0170_add_subnet_allow_dns.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0169_find_pod_host")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0171_remove_pod_host.py b/src/maasserver/migrations/maasserver/0171_remove_pod_host.py
index cf0c9d0..a92cdee 100644
--- a/src/maasserver/migrations/maasserver/0171_remove_pod_host.py
+++ b/src/maasserver/migrations/maasserver/0171_remove_pod_host.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0170_add_subnet_allow_dns")]
operations = [migrations.RemoveField(model_name="bmc", name="host")]
diff --git a/src/maasserver/migrations/maasserver/0172_partition_tags.py b/src/maasserver/migrations/maasserver/0172_partition_tags.py
index bec5046..1e5fa58 100644
--- a/src/maasserver/migrations/maasserver/0172_partition_tags.py
+++ b/src/maasserver/migrations/maasserver/0172_partition_tags.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0171_remove_pod_host")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0173_add_node_install_kvm.py b/src/maasserver/migrations/maasserver/0173_add_node_install_kvm.py
index 0bf737d..8ed09b9 100644
--- a/src/maasserver/migrations/maasserver/0173_add_node_install_kvm.py
+++ b/src/maasserver/migrations/maasserver/0173_add_node_install_kvm.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0172_partition_tags")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0174_add_user_id_and_node_system_id_for_events.py b/src/maasserver/migrations/maasserver/0174_add_user_id_and_node_system_id_for_events.py
index b8a16a6..c0d26a0 100644
--- a/src/maasserver/migrations/maasserver/0174_add_user_id_and_node_system_id_for_events.py
+++ b/src/maasserver/migrations/maasserver/0174_add_user_id_and_node_system_id_for_events.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0173_add_node_install_kvm")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0175_copy_user_id_and_node_system_id_for_events.py b/src/maasserver/migrations/maasserver/0175_copy_user_id_and_node_system_id_for_events.py
index 54fbf50..541d2d7 100644
--- a/src/maasserver/migrations/maasserver/0175_copy_user_id_and_node_system_id_for_events.py
+++ b/src/maasserver/migrations/maasserver/0175_copy_user_id_and_node_system_id_for_events.py
@@ -97,7 +97,6 @@ def copy_over_user_id_and_node_system_id(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0174_add_user_id_and_node_system_id_for_events")
]
diff --git a/src/maasserver/migrations/maasserver/0176_rename_user_id_migrate_to_user_id_for_events.py b/src/maasserver/migrations/maasserver/0176_rename_user_id_migrate_to_user_id_for_events.py
index 78a5881..c4630f7 100644
--- a/src/maasserver/migrations/maasserver/0176_rename_user_id_migrate_to_user_id_for_events.py
+++ b/src/maasserver/migrations/maasserver/0176_rename_user_id_migrate_to_user_id_for_events.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0175_copy_user_id_and_node_system_id_for_events")
]
diff --git a/src/maasserver/migrations/maasserver/0177_remove_unique_together_on_bmc.py b/src/maasserver/migrations/maasserver/0177_remove_unique_together_on_bmc.py
index 35e5bb8..e09f8d2 100644
--- a/src/maasserver/migrations/maasserver/0177_remove_unique_together_on_bmc.py
+++ b/src/maasserver/migrations/maasserver/0177_remove_unique_together_on_bmc.py
@@ -32,7 +32,6 @@ class AlterUniqueTogetherNoDB(migrations.AlterUniqueTogether):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0176_rename_user_id_migrate_to_user_id_for_events")
]
diff --git a/src/maasserver/migrations/maasserver/0178_break_apart_linked_bmcs.py b/src/maasserver/migrations/maasserver/0178_break_apart_linked_bmcs.py
index b56bada..0a3e187 100644
--- a/src/maasserver/migrations/maasserver/0178_break_apart_linked_bmcs.py
+++ b/src/maasserver/migrations/maasserver/0178_break_apart_linked_bmcs.py
@@ -41,7 +41,6 @@ def break_apart_linked_bmcs(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0177_remove_unique_together_on_bmc")]
operations = [migrations.RunPython(break_apart_linked_bmcs)]
diff --git a/src/maasserver/migrations/maasserver/0179_rbacsync.py b/src/maasserver/migrations/maasserver/0179_rbacsync.py
index e024aca..45da9b2 100644
--- a/src/maasserver/migrations/maasserver/0179_rbacsync.py
+++ b/src/maasserver/migrations/maasserver/0179_rbacsync.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0178_break_apart_linked_bmcs")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0180_rbaclastsync.py b/src/maasserver/migrations/maasserver/0180_rbaclastsync.py
index c21bf0c..c3cf97e 100644
--- a/src/maasserver/migrations/maasserver/0180_rbaclastsync.py
+++ b/src/maasserver/migrations/maasserver/0180_rbaclastsync.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0179_rbacsync")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0181_packagerepository_disable_sources.py b/src/maasserver/migrations/maasserver/0181_packagerepository_disable_sources.py
index 471f8cb..8131603 100644
--- a/src/maasserver/migrations/maasserver/0181_packagerepository_disable_sources.py
+++ b/src/maasserver/migrations/maasserver/0181_packagerepository_disable_sources.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0180_rbaclastsync")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0182_remove_duplicate_null_ips.py b/src/maasserver/migrations/maasserver/0182_remove_duplicate_null_ips.py
index 80ce0f8..83c99b7 100644
--- a/src/maasserver/migrations/maasserver/0182_remove_duplicate_null_ips.py
+++ b/src/maasserver/migrations/maasserver/0182_remove_duplicate_null_ips.py
@@ -70,7 +70,6 @@ REMOVE_NULL_IPS_MAX = REMOVE_NULL_IPS_TEMPLATE.format("max")
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0181_packagerepository_disable_sources")]
# We run the query first using max() and then min(). The reason for
diff --git a/src/maasserver/migrations/maasserver/0183_node_uuid.py b/src/maasserver/migrations/maasserver/0183_node_uuid.py
index 43695fa..7282a1e 100644
--- a/src/maasserver/migrations/maasserver/0183_node_uuid.py
+++ b/src/maasserver/migrations/maasserver/0183_node_uuid.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0182_remove_duplicate_null_ips")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0184_add_ephemeral_deploy_setting_to_node.py b/src/maasserver/migrations/maasserver/0184_add_ephemeral_deploy_setting_to_node.py
index 47eda5c..c7e91d0 100644
--- a/src/maasserver/migrations/maasserver/0184_add_ephemeral_deploy_setting_to_node.py
+++ b/src/maasserver/migrations/maasserver/0184_add_ephemeral_deploy_setting_to_node.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0183_node_uuid")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0185_vmfs6.py b/src/maasserver/migrations/maasserver/0185_vmfs6.py
index a66265c..e93bf83 100644
--- a/src/maasserver/migrations/maasserver/0185_vmfs6.py
+++ b/src/maasserver/migrations/maasserver/0185_vmfs6.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0184_add_ephemeral_deploy_setting_to_node")
]
diff --git a/src/maasserver/migrations/maasserver/0186_node_description.py b/src/maasserver/migrations/maasserver/0186_node_description.py
index 82d2100..ce78c92 100644
--- a/src/maasserver/migrations/maasserver/0186_node_description.py
+++ b/src/maasserver/migrations/maasserver/0186_node_description.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0185_vmfs6")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0187_status_messages_change_event_logging_levels.py b/src/maasserver/migrations/maasserver/0187_status_messages_change_event_logging_levels.py
index 9c58212..e0bba51 100644
--- a/src/maasserver/migrations/maasserver/0187_status_messages_change_event_logging_levels.py
+++ b/src/maasserver/migrations/maasserver/0187_status_messages_change_event_logging_levels.py
@@ -48,7 +48,6 @@ def change_event_levels_from_info_to_debug(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0186_node_description")]
operations = [migrations.RunPython(change_event_levels_from_info_to_debug)]
diff --git a/src/maasserver/migrations/maasserver/0188_network_testing.py b/src/maasserver/migrations/maasserver/0188_network_testing.py
index 7dad000..601f9df 100644
--- a/src/maasserver/migrations/maasserver/0188_network_testing.py
+++ b/src/maasserver/migrations/maasserver/0188_network_testing.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0187_status_messages_change_event_logging_levels")
]
diff --git a/src/maasserver/migrations/maasserver/0189_staticipaddress_temp_expires_on.py b/src/maasserver/migrations/maasserver/0189_staticipaddress_temp_expires_on.py
index 913cfdf..1f01f6b 100644
--- a/src/maasserver/migrations/maasserver/0189_staticipaddress_temp_expires_on.py
+++ b/src/maasserver/migrations/maasserver/0189_staticipaddress_temp_expires_on.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0188_network_testing")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0190_bmc_clean_duplicates.py b/src/maasserver/migrations/maasserver/0190_bmc_clean_duplicates.py
index e5c3733..fb66e2c 100644
--- a/src/maasserver/migrations/maasserver/0190_bmc_clean_duplicates.py
+++ b/src/maasserver/migrations/maasserver/0190_bmc_clean_duplicates.py
@@ -52,7 +52,6 @@ def clean_bmcs(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0189_staticipaddress_temp_expires_on")]
operations = [migrations.RunPython(clean_bmcs)]
diff --git a/src/maasserver/migrations/maasserver/0191_bmc_unique_power_type_and_parameters.py b/src/maasserver/migrations/maasserver/0191_bmc_unique_power_type_and_parameters.py
index acd7a6c..a4b2d4b 100644
--- a/src/maasserver/migrations/maasserver/0191_bmc_unique_power_type_and_parameters.py
+++ b/src/maasserver/migrations/maasserver/0191_bmc_unique_power_type_and_parameters.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0190_bmc_clean_duplicates")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0192_event_node_no_set_null.py b/src/maasserver/migrations/maasserver/0192_event_node_no_set_null.py
index 0ec457c..c4a4bd5 100644
--- a/src/maasserver/migrations/maasserver/0192_event_node_no_set_null.py
+++ b/src/maasserver/migrations/maasserver/0192_event_node_no_set_null.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
# depend on the latest patch in the 2.6 branch as this is meant to be
# backported there.
diff --git a/src/maasserver/migrations/maasserver/0193_merge_maasserver_0191_1092.py b/src/maasserver/migrations/maasserver/0193_merge_maasserver_0191_1092.py
index 98e5366..e9699cc 100644
--- a/src/maasserver/migrations/maasserver/0193_merge_maasserver_0191_1092.py
+++ b/src/maasserver/migrations/maasserver/0193_merge_maasserver_0191_1092.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0192_event_node_no_set_null"),
("maasserver", "0191_bmc_unique_power_type_and_parameters"),
diff --git a/src/maasserver/migrations/maasserver/0194_machine_listing_event_index.py b/src/maasserver/migrations/maasserver/0194_machine_listing_event_index.py
index 8464c9d..e1b67a0 100644
--- a/src/maasserver/migrations/maasserver/0194_machine_listing_event_index.py
+++ b/src/maasserver/migrations/maasserver/0194_machine_listing_event_index.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
# This depends on the latest (at time of writing) patch in 2.6,
# since this patch is to be backported there.
dependencies = [("maasserver", "0192_event_node_no_set_null")]
diff --git a/src/maasserver/migrations/maasserver/0195_event_username_max_length.py b/src/maasserver/migrations/maasserver/0195_event_username_max_length.py
index 9b5c6d3..7084561 100644
--- a/src/maasserver/migrations/maasserver/0195_event_username_max_length.py
+++ b/src/maasserver/migrations/maasserver/0195_event_username_max_length.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0194_machine_listing_event_index")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0195_merge_20190902_1357.py b/src/maasserver/migrations/maasserver/0195_merge_20190902_1357.py
index 80a6ae4..2349625 100644
--- a/src/maasserver/migrations/maasserver/0195_merge_20190902_1357.py
+++ b/src/maasserver/migrations/maasserver/0195_merge_20190902_1357.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0193_merge_maasserver_0191_1092"),
("maasserver", "0194_machine_listing_event_index"),
diff --git a/src/maasserver/migrations/maasserver/0196_numa_model.py b/src/maasserver/migrations/maasserver/0196_numa_model.py
index 971f5ca..1132599 100644
--- a/src/maasserver/migrations/maasserver/0196_numa_model.py
+++ b/src/maasserver/migrations/maasserver/0196_numa_model.py
@@ -36,7 +36,6 @@ def create_and_link_numa_nodes(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0195_merge_20190902_1357")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0197_remove_duplicate_physical_interfaces.py b/src/maasserver/migrations/maasserver/0197_remove_duplicate_physical_interfaces.py
index 7d10622..e2d709b 100644
--- a/src/maasserver/migrations/maasserver/0197_remove_duplicate_physical_interfaces.py
+++ b/src/maasserver/migrations/maasserver/0197_remove_duplicate_physical_interfaces.py
@@ -45,7 +45,6 @@ def remove_duplicate_physical_interfaces(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0196_numa_model")]
operations = [migrations.RunPython(remove_duplicate_physical_interfaces)]
diff --git a/src/maasserver/migrations/maasserver/0198_interface_physical_unique_mac.py b/src/maasserver/migrations/maasserver/0198_interface_physical_unique_mac.py
index 14c740f..4e65b3d 100644
--- a/src/maasserver/migrations/maasserver/0198_interface_physical_unique_mac.py
+++ b/src/maasserver/migrations/maasserver/0198_interface_physical_unique_mac.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0197_remove_duplicate_physical_interfaces")
]
diff --git a/src/maasserver/migrations/maasserver/0199_bootresource_tbz_txz.py b/src/maasserver/migrations/maasserver/0199_bootresource_tbz_txz.py
index 1ba26cd..3d8341b 100644
--- a/src/maasserver/migrations/maasserver/0199_bootresource_tbz_txz.py
+++ b/src/maasserver/migrations/maasserver/0199_bootresource_tbz_txz.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0198_interface_physical_unique_mac")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0200_interface_sriov_max_vf.py b/src/maasserver/migrations/maasserver/0200_interface_sriov_max_vf.py
index 0c08d43..64cb504 100644
--- a/src/maasserver/migrations/maasserver/0200_interface_sriov_max_vf.py
+++ b/src/maasserver/migrations/maasserver/0200_interface_sriov_max_vf.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0199_bootresource_tbz_txz")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0201_merge_20191008_1426.py b/src/maasserver/migrations/maasserver/0201_merge_20191008_1426.py
index edc1f96..7b3f23a 100644
--- a/src/maasserver/migrations/maasserver/0201_merge_20191008_1426.py
+++ b/src/maasserver/migrations/maasserver/0201_merge_20191008_1426.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0200_interface_sriov_max_vf"),
("maasserver", "0195_event_username_max_length"),
diff --git a/src/maasserver/migrations/maasserver/0202_event_node_on_delete.py b/src/maasserver/migrations/maasserver/0202_event_node_on_delete.py
index 4184944..f1f7e26 100644
--- a/src/maasserver/migrations/maasserver/0202_event_node_on_delete.py
+++ b/src/maasserver/migrations/maasserver/0202_event_node_on_delete.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0201_merge_20191008_1426")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0203_interface_node_name_duplicates_delete.py b/src/maasserver/migrations/maasserver/0203_interface_node_name_duplicates_delete.py
index ba43b83..278d8cb 100644
--- a/src/maasserver/migrations/maasserver/0203_interface_node_name_duplicates_delete.py
+++ b/src/maasserver/migrations/maasserver/0203_interface_node_name_duplicates_delete.py
@@ -53,7 +53,6 @@ def delete_duplicate_interfaces(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0202_event_node_on_delete")]
operations = [migrations.RunPython(delete_duplicate_interfaces)]
diff --git a/src/maasserver/migrations/maasserver/0204_interface_node_name_unique_together.py b/src/maasserver/migrations/maasserver/0204_interface_node_name_unique_together.py
index 290590c..3dc8467 100644
--- a/src/maasserver/migrations/maasserver/0204_interface_node_name_unique_together.py
+++ b/src/maasserver/migrations/maasserver/0204_interface_node_name_unique_together.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0203_interface_node_name_duplicates_delete")
]
diff --git a/src/maasserver/migrations/maasserver/0205_pod_nodes.py b/src/maasserver/migrations/maasserver/0205_pod_nodes.py
index 1cc6be7..394008b 100644
--- a/src/maasserver/migrations/maasserver/0205_pod_nodes.py
+++ b/src/maasserver/migrations/maasserver/0205_pod_nodes.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0204_interface_node_name_unique_together")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0206_remove_node_token.py b/src/maasserver/migrations/maasserver/0206_remove_node_token.py
index ece2959..bc6614c 100644
--- a/src/maasserver/migrations/maasserver/0206_remove_node_token.py
+++ b/src/maasserver/migrations/maasserver/0206_remove_node_token.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0205_pod_nodes")]
operations = [migrations.RemoveField(model_name="node", name="token")]
diff --git a/src/maasserver/migrations/maasserver/0207_notification_dismissable.py b/src/maasserver/migrations/maasserver/0207_notification_dismissable.py
index 55475e9..a55c15b 100644
--- a/src/maasserver/migrations/maasserver/0207_notification_dismissable.py
+++ b/src/maasserver/migrations/maasserver/0207_notification_dismissable.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0206_remove_node_token")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0208_no_power_query_events.py b/src/maasserver/migrations/maasserver/0208_no_power_query_events.py
index 300f71a..3292892 100644
--- a/src/maasserver/migrations/maasserver/0208_no_power_query_events.py
+++ b/src/maasserver/migrations/maasserver/0208_no_power_query_events.py
@@ -17,7 +17,6 @@ def delete_power_query_events(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0207_notification_dismissable")]
operations = [migrations.RunPython(delete_power_query_events)]
diff --git a/src/maasserver/migrations/maasserver/0209_default_partitiontable_gpt.py b/src/maasserver/migrations/maasserver/0209_default_partitiontable_gpt.py
index 8a27d0e..d9b993a 100644
--- a/src/maasserver/migrations/maasserver/0209_default_partitiontable_gpt.py
+++ b/src/maasserver/migrations/maasserver/0209_default_partitiontable_gpt.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0208_no_power_query_events")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0210_filepathfield_to_charfield.py b/src/maasserver/migrations/maasserver/0210_filepathfield_to_charfield.py
index 3924f41..acdf28d 100644
--- a/src/maasserver/migrations/maasserver/0210_filepathfield_to_charfield.py
+++ b/src/maasserver/migrations/maasserver/0210_filepathfield_to_charfield.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0209_default_partitiontable_gpt")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0211_jsonfield_default_callable.py b/src/maasserver/migrations/maasserver/0211_jsonfield_default_callable.py
index c326467..7ffcecb 100644
--- a/src/maasserver/migrations/maasserver/0211_jsonfield_default_callable.py
+++ b/src/maasserver/migrations/maasserver/0211_jsonfield_default_callable.py
@@ -5,7 +5,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0210_filepathfield_to_charfield")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0212_notifications_fields.py b/src/maasserver/migrations/maasserver/0212_notifications_fields.py
index 7cfd53b..65e4c4d 100644
--- a/src/maasserver/migrations/maasserver/0212_notifications_fields.py
+++ b/src/maasserver/migrations/maasserver/0212_notifications_fields.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0211_jsonfield_default_callable")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0213_virtual_machine.py b/src/maasserver/migrations/maasserver/0213_virtual_machine.py
index 69d126e..68eb1fd 100644
--- a/src/maasserver/migrations/maasserver/0213_virtual_machine.py
+++ b/src/maasserver/migrations/maasserver/0213_virtual_machine.py
@@ -35,7 +35,6 @@ def create_virtual_machines(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0212_notifications_fields")]
operations = [
diff --git a/src/maasserver/migrations/maasserver/0214_virtualmachine_one_to_one.py b/src/maasserver/migrations/maasserver/0214_virtualmachine_one_to_one.py
index f2dcaf7..ea127c9 100644
--- a/src/maasserver/migrations/maasserver/0214_virtualmachine_one_to_one.py
+++ b/src/maasserver/migrations/maasserver/0214_virtualmachine_one_to_one.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0213_virtual_machine"),
]
diff --git a/src/maasserver/migrations/maasserver/0215_numanode_hugepages.py b/src/maasserver/migrations/maasserver/0215_numanode_hugepages.py
index 76ff1a4..ec5c6ad 100644
--- a/src/maasserver/migrations/maasserver/0215_numanode_hugepages.py
+++ b/src/maasserver/migrations/maasserver/0215_numanode_hugepages.py
@@ -7,7 +7,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0214_virtualmachine_one_to_one"),
]
diff --git a/src/maasserver/migrations/maasserver/0216_remove_skip_bmc_config_column.py b/src/maasserver/migrations/maasserver/0216_remove_skip_bmc_config_column.py
index 57b3baa..0536c72 100644
--- a/src/maasserver/migrations/maasserver/0216_remove_skip_bmc_config_column.py
+++ b/src/maasserver/migrations/maasserver/0216_remove_skip_bmc_config_column.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0215_numanode_hugepages"),
]
diff --git a/src/maasserver/migrations/maasserver/0217_notification_dismissal_timestamp.py b/src/maasserver/migrations/maasserver/0217_notification_dismissal_timestamp.py
index 24a174b..8137457 100644
--- a/src/maasserver/migrations/maasserver/0217_notification_dismissal_timestamp.py
+++ b/src/maasserver/migrations/maasserver/0217_notification_dismissal_timestamp.py
@@ -5,7 +5,6 @@ import django.utils.timezone
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0216_remove_skip_bmc_config_column"),
]
diff --git a/src/maasserver/migrations/maasserver/0218_images_maas_io_daily_to_stable.py b/src/maasserver/migrations/maasserver/0218_images_maas_io_daily_to_stable.py
index 9818c7f..90ea89a 100644
--- a/src/maasserver/migrations/maasserver/0218_images_maas_io_daily_to_stable.py
+++ b/src/maasserver/migrations/maasserver/0218_images_maas_io_daily_to_stable.py
@@ -10,7 +10,6 @@ def daily_to_stable(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("maasserver", "0217_notification_dismissal_timestamp")]
operations = [migrations.RunPython(daily_to_stable)]
diff --git a/src/maasserver/migrations/maasserver/0219_vm_nic_link.py b/src/maasserver/migrations/maasserver/0219_vm_nic_link.py
index badac6e..ded377a 100644
--- a/src/maasserver/migrations/maasserver/0219_vm_nic_link.py
+++ b/src/maasserver/migrations/maasserver/0219_vm_nic_link.py
@@ -8,7 +8,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0218_images_maas_io_daily_to_stable"),
]
diff --git a/src/maasserver/migrations/maasserver/0220_nodedevice.py b/src/maasserver/migrations/maasserver/0220_nodedevice.py
index 15a874f..a3ad1f0 100644
--- a/src/maasserver/migrations/maasserver/0220_nodedevice.py
+++ b/src/maasserver/migrations/maasserver/0220_nodedevice.py
@@ -10,7 +10,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0219_vm_nic_link"),
]
diff --git a/src/maasserver/migrations/maasserver/0221_track_lxd_project.py b/src/maasserver/migrations/maasserver/0221_track_lxd_project.py
index 35467fe..2d715c4 100644
--- a/src/maasserver/migrations/maasserver/0221_track_lxd_project.py
+++ b/src/maasserver/migrations/maasserver/0221_track_lxd_project.py
@@ -15,7 +15,6 @@ def lxd_bmcs_add_project(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0220_nodedevice"),
]
diff --git a/src/maasserver/migrations/maasserver/0222_replace_node_creation_type.py b/src/maasserver/migrations/maasserver/0222_replace_node_creation_type.py
index 0700688..b97e4c1 100644
--- a/src/maasserver/migrations/maasserver/0222_replace_node_creation_type.py
+++ b/src/maasserver/migrations/maasserver/0222_replace_node_creation_type.py
@@ -13,7 +13,6 @@ def fill_node_dynamic(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0221_track_lxd_project"),
]
diff --git a/src/maasserver/migrations/maasserver/0223_virtualmachine_blank_project.py b/src/maasserver/migrations/maasserver/0223_virtualmachine_blank_project.py
index ec3cc05..f7c18b2 100644
--- a/src/maasserver/migrations/maasserver/0223_virtualmachine_blank_project.py
+++ b/src/maasserver/migrations/maasserver/0223_virtualmachine_blank_project.py
@@ -29,7 +29,6 @@ def create_virtual_machines(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0222_replace_node_creation_type"),
]
diff --git a/src/maasserver/migrations/maasserver/0224_virtual_machine_disk.py b/src/maasserver/migrations/maasserver/0224_virtual_machine_disk.py
index fb4635e..3f81dd0 100644
--- a/src/maasserver/migrations/maasserver/0224_virtual_machine_disk.py
+++ b/src/maasserver/migrations/maasserver/0224_virtual_machine_disk.py
@@ -39,7 +39,6 @@ def sync_vm_disks(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0223_virtualmachine_blank_project"),
]
diff --git a/src/maasserver/migrations/maasserver/0225_drop_rsd_pod.py b/src/maasserver/migrations/maasserver/0225_drop_rsd_pod.py
index a35c1fd..7602efc 100644
--- a/src/maasserver/migrations/maasserver/0225_drop_rsd_pod.py
+++ b/src/maasserver/migrations/maasserver/0225_drop_rsd_pod.py
@@ -9,7 +9,6 @@ def drop_rsd_pods(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0224_virtual_machine_disk"),
]
diff --git a/src/maasserver/migrations/maasserver/0226_drop_iscsi_storage.py b/src/maasserver/migrations/maasserver/0226_drop_iscsi_storage.py
index 89e76b8..3fb56c4 100644
--- a/src/maasserver/migrations/maasserver/0226_drop_iscsi_storage.py
+++ b/src/maasserver/migrations/maasserver/0226_drop_iscsi_storage.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0225_drop_rsd_pod"),
]
diff --git a/src/maasserver/migrations/maasserver/0227_drop_pod_local_storage.py b/src/maasserver/migrations/maasserver/0227_drop_pod_local_storage.py
index ef1fd63..09a1999 100644
--- a/src/maasserver/migrations/maasserver/0227_drop_pod_local_storage.py
+++ b/src/maasserver/migrations/maasserver/0227_drop_pod_local_storage.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0226_drop_iscsi_storage"),
]
diff --git a/src/maasserver/migrations/maasserver/0228_drop_iscsiblockdevice.py b/src/maasserver/migrations/maasserver/0228_drop_iscsiblockdevice.py
index 4f55e9b..ce352f8 100644
--- a/src/maasserver/migrations/maasserver/0228_drop_iscsiblockdevice.py
+++ b/src/maasserver/migrations/maasserver/0228_drop_iscsiblockdevice.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0227_drop_pod_local_storage"),
]
diff --git a/src/maasserver/migrations/maasserver/0229_drop_physicalblockdevice_storage_pool.py b/src/maasserver/migrations/maasserver/0229_drop_physicalblockdevice_storage_pool.py
index 9173f1e..9b7b16c 100644
--- a/src/maasserver/migrations/maasserver/0229_drop_physicalblockdevice_storage_pool.py
+++ b/src/maasserver/migrations/maasserver/0229_drop_physicalblockdevice_storage_pool.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0228_drop_iscsiblockdevice"),
]
diff --git a/src/maasserver/migrations/maasserver/0230_tag_kernel_opts_blank_instead_of_null.py b/src/maasserver/migrations/maasserver/0230_tag_kernel_opts_blank_instead_of_null.py
index 397b945..9450794 100644
--- a/src/maasserver/migrations/maasserver/0230_tag_kernel_opts_blank_instead_of_null.py
+++ b/src/maasserver/migrations/maasserver/0230_tag_kernel_opts_blank_instead_of_null.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0229_drop_physicalblockdevice_storage_pool"),
]
diff --git a/src/maasserver/migrations/maasserver/0231_bmc_version.py b/src/maasserver/migrations/maasserver/0231_bmc_version.py
index ccdf5ff..2c42b90 100644
--- a/src/maasserver/migrations/maasserver/0231_bmc_version.py
+++ b/src/maasserver/migrations/maasserver/0231_bmc_version.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0230_tag_kernel_opts_blank_instead_of_null"),
]
diff --git a/src/maasserver/migrations/maasserver/0232_drop_controllerinfo_interface_fields.py b/src/maasserver/migrations/maasserver/0232_drop_controllerinfo_interface_fields.py
index c7a2d16..a5a8f07 100644
--- a/src/maasserver/migrations/maasserver/0232_drop_controllerinfo_interface_fields.py
+++ b/src/maasserver/migrations/maasserver/0232_drop_controllerinfo_interface_fields.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0231_bmc_version"),
]
diff --git a/src/maasserver/migrations/maasserver/0233_drop_switch.py b/src/maasserver/migrations/maasserver/0233_drop_switch.py
index c2a0383..ecd1028 100644
--- a/src/maasserver/migrations/maasserver/0233_drop_switch.py
+++ b/src/maasserver/migrations/maasserver/0233_drop_switch.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0232_drop_controllerinfo_interface_fields"),
]
diff --git a/src/maasserver/migrations/maasserver/0234_node_register_vmhost.py b/src/maasserver/migrations/maasserver/0234_node_register_vmhost.py
index 6d291fc..6431a08 100644
--- a/src/maasserver/migrations/maasserver/0234_node_register_vmhost.py
+++ b/src/maasserver/migrations/maasserver/0234_node_register_vmhost.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0233_drop_switch"),
]
diff --git a/src/maasserver/migrations/maasserver/0235_controllerinfo_versions_details.py b/src/maasserver/migrations/maasserver/0235_controllerinfo_versions_details.py
index da93d75..48c2b1e 100644
--- a/src/maasserver/migrations/maasserver/0235_controllerinfo_versions_details.py
+++ b/src/maasserver/migrations/maasserver/0235_controllerinfo_versions_details.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0234_node_register_vmhost"),
]
diff --git a/src/maasserver/migrations/maasserver/0236_controllerinfo_update_first_reported.py b/src/maasserver/migrations/maasserver/0236_controllerinfo_update_first_reported.py
index b1fef88..016d282 100644
--- a/src/maasserver/migrations/maasserver/0236_controllerinfo_update_first_reported.py
+++ b/src/maasserver/migrations/maasserver/0236_controllerinfo_update_first_reported.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0235_controllerinfo_versions_details"),
]
diff --git a/src/maasserver/migrations/maasserver/0237_drop_controller_version_mismatch_notifications.py b/src/maasserver/migrations/maasserver/0237_drop_controller_version_mismatch_notifications.py
index d4e4a4c..d338992 100644
--- a/src/maasserver/migrations/maasserver/0237_drop_controller_version_mismatch_notifications.py
+++ b/src/maasserver/migrations/maasserver/0237_drop_controller_version_mismatch_notifications.py
@@ -11,7 +11,6 @@ def drop_notifications(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0236_controllerinfo_update_first_reported"),
]
diff --git a/src/maasserver/migrations/maasserver/0238_disable_boot_architectures.py b/src/maasserver/migrations/maasserver/0238_disable_boot_architectures.py
index fc5d7bb..6340004 100644
--- a/src/maasserver/migrations/maasserver/0238_disable_boot_architectures.py
+++ b/src/maasserver/migrations/maasserver/0238_disable_boot_architectures.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0237_drop_controller_version_mismatch_notifications"),
]
diff --git a/src/maasserver/migrations/maasserver/0239_add_iprange_specific_dhcp_snippets.py b/src/maasserver/migrations/maasserver/0239_add_iprange_specific_dhcp_snippets.py
index f5bba86..efa3807 100644
--- a/src/maasserver/migrations/maasserver/0239_add_iprange_specific_dhcp_snippets.py
+++ b/src/maasserver/migrations/maasserver/0239_add_iprange_specific_dhcp_snippets.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0238_disable_boot_architectures"),
]
diff --git a/src/maasserver/migrations/maasserver/0240_ownerdata_key_fix.py b/src/maasserver/migrations/maasserver/0240_ownerdata_key_fix.py
index b2d4949..e07db7b 100644
--- a/src/maasserver/migrations/maasserver/0240_ownerdata_key_fix.py
+++ b/src/maasserver/migrations/maasserver/0240_ownerdata_key_fix.py
@@ -34,7 +34,6 @@ def fix_ownerdata_keys(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0239_add_iprange_specific_dhcp_snippets"),
]
diff --git a/src/maasserver/migrations/maasserver/0241_physical_interface_default_node_numanode.py b/src/maasserver/migrations/maasserver/0241_physical_interface_default_node_numanode.py
index 7cfcabd..23b1182 100644
--- a/src/maasserver/migrations/maasserver/0241_physical_interface_default_node_numanode.py
+++ b/src/maasserver/migrations/maasserver/0241_physical_interface_default_node_numanode.py
@@ -50,7 +50,6 @@ def fix_empty_interface_numanode(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0240_ownerdata_key_fix"),
]
diff --git a/src/maasserver/migrations/maasserver/0242_forwarddnsserver.py b/src/maasserver/migrations/maasserver/0242_forwarddnsserver.py
index dc5fdd9..e85d6ea 100644
--- a/src/maasserver/migrations/maasserver/0242_forwarddnsserver.py
+++ b/src/maasserver/migrations/maasserver/0242_forwarddnsserver.py
@@ -6,7 +6,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0241_physical_interface_default_node_numanode"),
]
diff --git a/src/maasserver/migrations/maasserver/0243_node_dynamic_for_controller_and_vmhost.py b/src/maasserver/migrations/maasserver/0243_node_dynamic_for_controller_and_vmhost.py
index e0b2135..d375b33 100644
--- a/src/maasserver/migrations/maasserver/0243_node_dynamic_for_controller_and_vmhost.py
+++ b/src/maasserver/migrations/maasserver/0243_node_dynamic_for_controller_and_vmhost.py
@@ -19,7 +19,6 @@ def set_node_dynamic(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0242_forwarddnsserver"),
]
diff --git a/src/maasserver/migrations/maasserver/0244_controller_nodes_deployed.py b/src/maasserver/migrations/maasserver/0244_controller_nodes_deployed.py
index 7b2fdba..b134041 100644
--- a/src/maasserver/migrations/maasserver/0244_controller_nodes_deployed.py
+++ b/src/maasserver/migrations/maasserver/0244_controller_nodes_deployed.py
@@ -23,7 +23,6 @@ def set_node_deployed(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0243_node_dynamic_for_controller_and_vmhost"),
]
diff --git a/src/maasserver/migrations/maasserver/0245_bmc_power_parameters_index_hash.py b/src/maasserver/migrations/maasserver/0245_bmc_power_parameters_index_hash.py
index 070e640..653548a 100644
--- a/src/maasserver/migrations/maasserver/0245_bmc_power_parameters_index_hash.py
+++ b/src/maasserver/migrations/maasserver/0245_bmc_power_parameters_index_hash.py
@@ -5,7 +5,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0244_controller_nodes_deployed"),
]
diff --git a/src/maasserver/migrations/maasserver/0246_bootresource_custom_base_type.py b/src/maasserver/migrations/maasserver/0246_bootresource_custom_base_type.py
index 9cb4487..c827cb7 100644
--- a/src/maasserver/migrations/maasserver/0246_bootresource_custom_base_type.py
+++ b/src/maasserver/migrations/maasserver/0246_bootresource_custom_base_type.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0245_bmc_power_parameters_index_hash"),
]
diff --git a/src/maasserver/migrations/maasserver/0247_auto_20210915_1545.py b/src/maasserver/migrations/maasserver/0247_auto_20210915_1545.py
index 72fa839..e4deab3 100644
--- a/src/maasserver/migrations/maasserver/0247_auto_20210915_1545.py
+++ b/src/maasserver/migrations/maasserver/0247_auto_20210915_1545.py
@@ -7,7 +7,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0246_bootresource_custom_base_type"),
]
diff --git a/src/maasserver/migrations/maasserver/0248_auto_20211006_1829.py b/src/maasserver/migrations/maasserver/0248_auto_20211006_1829.py
index 32e9f4f..8884d37 100644
--- a/src/maasserver/migrations/maasserver/0248_auto_20211006_1829.py
+++ b/src/maasserver/migrations/maasserver/0248_auto_20211006_1829.py
@@ -7,7 +7,6 @@ import maasserver.models.node
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0247_auto_20210915_1545"),
]
diff --git a/src/maasserver/migrations/maasserver/0249_lxd_auth_metrics.py b/src/maasserver/migrations/maasserver/0249_lxd_auth_metrics.py
index 3d8b84d..d93af21 100644
--- a/src/maasserver/migrations/maasserver/0249_lxd_auth_metrics.py
+++ b/src/maasserver/migrations/maasserver/0249_lxd_auth_metrics.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0248_auto_20211006_1829"),
]
diff --git a/src/maasserver/migrations/maasserver/0250_node_last_applied_storage_layout.py b/src/maasserver/migrations/maasserver/0250_node_last_applied_storage_layout.py
index 7027e3b..9523a36 100644
--- a/src/maasserver/migrations/maasserver/0250_node_last_applied_storage_layout.py
+++ b/src/maasserver/migrations/maasserver/0250_node_last_applied_storage_layout.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0249_lxd_auth_metrics"),
]
diff --git a/src/maasserver/migrations/maasserver/0251_auto_20211027_2128.py b/src/maasserver/migrations/maasserver/0251_auto_20211027_2128.py
index 78d667d..7321468 100644
--- a/src/maasserver/migrations/maasserver/0251_auto_20211027_2128.py
+++ b/src/maasserver/migrations/maasserver/0251_auto_20211027_2128.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0250_node_last_applied_storage_layout"),
]
diff --git a/src/maasserver/migrations/maasserver/0252_drop_fannetwork.py b/src/maasserver/migrations/maasserver/0252_drop_fannetwork.py
index 425092b..3f395b1 100644
--- a/src/maasserver/migrations/maasserver/0252_drop_fannetwork.py
+++ b/src/maasserver/migrations/maasserver/0252_drop_fannetwork.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0251_auto_20211027_2128"),
]
diff --git a/src/maasserver/migrations/maasserver/0253_nodeconfig.py b/src/maasserver/migrations/maasserver/0253_nodeconfig.py
index 7742809..3769ca2 100644
--- a/src/maasserver/migrations/maasserver/0253_nodeconfig.py
+++ b/src/maasserver/migrations/maasserver/0253_nodeconfig.py
@@ -20,7 +20,6 @@ def create_default_nodeconfigs(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0252_drop_fannetwork"),
]
diff --git a/src/maasserver/migrations/maasserver/0254_default_nodeconfig_devices.py b/src/maasserver/migrations/maasserver/0254_default_nodeconfig_devices.py
index b1a2f3b..11c1e6a 100644
--- a/src/maasserver/migrations/maasserver/0254_default_nodeconfig_devices.py
+++ b/src/maasserver/migrations/maasserver/0254_default_nodeconfig_devices.py
@@ -25,7 +25,6 @@ def create_default_nodeconfig_devices(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0253_nodeconfig"),
]
diff --git a/src/maasserver/migrations/maasserver/0255_node_current_config.py b/src/maasserver/migrations/maasserver/0255_node_current_config.py
index c22f1d9..1d9ea9b 100644
--- a/src/maasserver/migrations/maasserver/0255_node_current_config.py
+++ b/src/maasserver/migrations/maasserver/0255_node_current_config.py
@@ -17,7 +17,6 @@ def link_current_node_configs(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0254_default_nodeconfig_devices"),
]
diff --git a/src/maasserver/migrations/maasserver/0256_blockdevice_nodeconfig_only.py b/src/maasserver/migrations/maasserver/0256_blockdevice_nodeconfig_only.py
index 24e1b72..2a58e88 100644
--- a/src/maasserver/migrations/maasserver/0256_blockdevice_nodeconfig_only.py
+++ b/src/maasserver/migrations/maasserver/0256_blockdevice_nodeconfig_only.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0255_node_current_config"),
]
diff --git a/src/maasserver/migrations/maasserver/0257_filesystem_populate_node_config_id.py b/src/maasserver/migrations/maasserver/0257_filesystem_populate_node_config_id.py
index 4d36e55..8305c4a 100644
--- a/src/maasserver/migrations/maasserver/0257_filesystem_populate_node_config_id.py
+++ b/src/maasserver/migrations/maasserver/0257_filesystem_populate_node_config_id.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0256_blockdevice_nodeconfig_only"),
]
diff --git a/src/maasserver/migrations/maasserver/0258_filesystem_nodeconfig_only.py b/src/maasserver/migrations/maasserver/0258_filesystem_nodeconfig_only.py
index 08705cc..c34b842 100644
--- a/src/maasserver/migrations/maasserver/0258_filesystem_nodeconfig_only.py
+++ b/src/maasserver/migrations/maasserver/0258_filesystem_nodeconfig_only.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0257_filesystem_populate_node_config_id"),
]
diff --git a/src/maasserver/migrations/maasserver/0259_add_hardware_sync_flag.py b/src/maasserver/migrations/maasserver/0259_add_hardware_sync_flag.py
index 7ce60b1..56f01f0 100644
--- a/src/maasserver/migrations/maasserver/0259_add_hardware_sync_flag.py
+++ b/src/maasserver/migrations/maasserver/0259_add_hardware_sync_flag.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0258_filesystem_nodeconfig_only"),
]
diff --git a/src/maasserver/migrations/maasserver/0260_drop_maas_support_views.py b/src/maasserver/migrations/maasserver/0260_drop_maas_support_views.py
index ab92cda..749d839 100644
--- a/src/maasserver/migrations/maasserver/0260_drop_maas_support_views.py
+++ b/src/maasserver/migrations/maasserver/0260_drop_maas_support_views.py
@@ -16,7 +16,6 @@ SUPPORT_VIEWS = (
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0259_add_hardware_sync_flag"),
]
diff --git a/src/maasserver/migrations/maasserver/0261_interface_nodeconfig_only.py b/src/maasserver/migrations/maasserver/0261_interface_nodeconfig_only.py
index 107b668..fb3d9b6 100644
--- a/src/maasserver/migrations/maasserver/0261_interface_nodeconfig_only.py
+++ b/src/maasserver/migrations/maasserver/0261_interface_nodeconfig_only.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0260_drop_maas_support_views"),
]
diff --git a/src/maasserver/migrations/maasserver/0262_nodeconfig_link_replace_node.py b/src/maasserver/migrations/maasserver/0262_nodeconfig_link_replace_node.py
index 7f9eee4..262fa06 100644
--- a/src/maasserver/migrations/maasserver/0262_nodeconfig_link_replace_node.py
+++ b/src/maasserver/migrations/maasserver/0262_nodeconfig_link_replace_node.py
@@ -3,7 +3,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0261_interface_nodeconfig_only"),
]
diff --git a/src/maasserver/migrations/maasserver/0263_vlan_racks_on_delete.py b/src/maasserver/migrations/maasserver/0263_vlan_racks_on_delete.py
index 48a92ea..08e2be2 100644
--- a/src/maasserver/migrations/maasserver/0263_vlan_racks_on_delete.py
+++ b/src/maasserver/migrations/maasserver/0263_vlan_racks_on_delete.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0262_nodeconfig_link_replace_node"),
]
diff --git a/src/maasserver/migrations/maasserver/0264_nodedevice_nodeconfig_link.py b/src/maasserver/migrations/maasserver/0264_nodedevice_nodeconfig_link.py
index 13b3666..5640006 100644
--- a/src/maasserver/migrations/maasserver/0264_nodedevice_nodeconfig_link.py
+++ b/src/maasserver/migrations/maasserver/0264_nodedevice_nodeconfig_link.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0263_vlan_racks_on_delete"),
]
diff --git a/src/maasserver/migrations/maasserver/0265_nodedevice_nodeconfig_migrate.py b/src/maasserver/migrations/maasserver/0265_nodedevice_nodeconfig_migrate.py
index 9a5ba2f..72b3031 100644
--- a/src/maasserver/migrations/maasserver/0265_nodedevice_nodeconfig_migrate.py
+++ b/src/maasserver/migrations/maasserver/0265_nodedevice_nodeconfig_migrate.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0264_nodedevice_nodeconfig_link"),
]
diff --git a/src/maasserver/migrations/maasserver/0266_nodedevice_unlink_node.py b/src/maasserver/migrations/maasserver/0266_nodedevice_unlink_node.py
index 2941386..69e0eba 100644
--- a/src/maasserver/migrations/maasserver/0266_nodedevice_unlink_node.py
+++ b/src/maasserver/migrations/maasserver/0266_nodedevice_unlink_node.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0265_nodedevice_nodeconfig_migrate"),
]
diff --git a/src/maasserver/migrations/maasserver/0267_add_machine_specific_sync_interval_fields.py b/src/maasserver/migrations/maasserver/0267_add_machine_specific_sync_interval_fields.py
index 99d3d99..610c6fa 100644
--- a/src/maasserver/migrations/maasserver/0267_add_machine_specific_sync_interval_fields.py
+++ b/src/maasserver/migrations/maasserver/0267_add_machine_specific_sync_interval_fields.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0266_nodedevice_unlink_node"),
]
diff --git a/src/maasserver/migrations/maasserver/0268_partition_index.py b/src/maasserver/migrations/maasserver/0268_partition_index.py
index 9193260..699b7a9 100644
--- a/src/maasserver/migrations/maasserver/0268_partition_index.py
+++ b/src/maasserver/migrations/maasserver/0268_partition_index.py
@@ -139,7 +139,6 @@ def partitions_size_match(actual_sizes, expected_sizes):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0267_add_machine_specific_sync_interval_fields"),
]
diff --git a/src/maasserver/migrations/maasserver/0269_interface_idx_include_nodeconfig.py b/src/maasserver/migrations/maasserver/0269_interface_idx_include_nodeconfig.py
index 4ae002b..f389562 100644
--- a/src/maasserver/migrations/maasserver/0269_interface_idx_include_nodeconfig.py
+++ b/src/maasserver/migrations/maasserver/0269_interface_idx_include_nodeconfig.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0268_partition_index"),
]
diff --git a/src/maasserver/migrations/maasserver/0270_storage_uuid_drop_unique.py b/src/maasserver/migrations/maasserver/0270_storage_uuid_drop_unique.py
index 27ea36b..4334d63 100644
--- a/src/maasserver/migrations/maasserver/0270_storage_uuid_drop_unique.py
+++ b/src/maasserver/migrations/maasserver/0270_storage_uuid_drop_unique.py
@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0269_interface_idx_include_nodeconfig"),
]
diff --git a/src/maasserver/migrations/maasserver/0271_interface_unique.py b/src/maasserver/migrations/maasserver/0271_interface_unique.py
index 5b4f39a..12b5542 100644
--- a/src/maasserver/migrations/maasserver/0271_interface_unique.py
+++ b/src/maasserver/migrations/maasserver/0271_interface_unique.py
@@ -10,7 +10,6 @@ OLD_INDEXES = (
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0270_storage_uuid_drop_unique"),
]
diff --git a/src/maasserver/migrations/maasserver/0272_virtualmachine_resources_unique.py b/src/maasserver/migrations/maasserver/0272_virtualmachine_resources_unique.py
index fe4b064..bfa85cc 100644
--- a/src/maasserver/migrations/maasserver/0272_virtualmachine_resources_unique.py
+++ b/src/maasserver/migrations/maasserver/0272_virtualmachine_resources_unique.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0271_interface_unique"),
]
diff --git a/src/maasserver/migrations/maasserver/0273_ipaddress_defaults.py b/src/maasserver/migrations/maasserver/0273_ipaddress_defaults.py
index 66c94c4..e3ceb34 100644
--- a/src/maasserver/migrations/maasserver/0273_ipaddress_defaults.py
+++ b/src/maasserver/migrations/maasserver/0273_ipaddress_defaults.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0272_virtualmachine_resources_unique"),
]
diff --git a/src/maasserver/migrations/maasserver/0274_audit_log_add_endpoint_cli_type.py b/src/maasserver/migrations/maasserver/0274_audit_log_add_endpoint_cli_type.py
index cab332b..52d1229 100644
--- a/src/maasserver/migrations/maasserver/0274_audit_log_add_endpoint_cli_type.py
+++ b/src/maasserver/migrations/maasserver/0274_audit_log_add_endpoint_cli_type.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0273_ipaddress_defaults"),
]
diff --git a/src/maasserver/migrations/maasserver/0275_interface_children.py b/src/maasserver/migrations/maasserver/0275_interface_children.py
index ab96f56..0888961 100644
--- a/src/maasserver/migrations/maasserver/0275_interface_children.py
+++ b/src/maasserver/migrations/maasserver/0275_interface_children.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0274_audit_log_add_endpoint_cli_type"),
]
diff --git a/src/maasserver/migrations/maasserver/0276_bmc_autodetect_metric.py b/src/maasserver/migrations/maasserver/0276_bmc_autodetect_metric.py
index d9ac5a0..2426eab 100644
--- a/src/maasserver/migrations/maasserver/0276_bmc_autodetect_metric.py
+++ b/src/maasserver/migrations/maasserver/0276_bmc_autodetect_metric.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0275_interface_children"),
]
diff --git a/src/maasserver/migrations/maasserver/0277_replace_nullbooleanfield.py b/src/maasserver/migrations/maasserver/0277_replace_nullbooleanfield.py
index 15a43f9..b957948 100644
--- a/src/maasserver/migrations/maasserver/0277_replace_nullbooleanfield.py
+++ b/src/maasserver/migrations/maasserver/0277_replace_nullbooleanfield.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0276_bmc_autodetect_metric"),
]
diff --git a/src/maasserver/migrations/maasserver/0278_generic_jsonfield.py b/src/maasserver/migrations/maasserver/0278_generic_jsonfield.py
index 60d600e..e9d9c9c 100644
--- a/src/maasserver/migrations/maasserver/0278_generic_jsonfield.py
+++ b/src/maasserver/migrations/maasserver/0278_generic_jsonfield.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0277_replace_nullbooleanfield"),
]
diff --git a/src/maasserver/migrations/maasserver/0279_store_vpd_metadata_for_nodedevice.py b/src/maasserver/migrations/maasserver/0279_store_vpd_metadata_for_nodedevice.py
index e06fead..e034c28 100644
--- a/src/maasserver/migrations/maasserver/0279_store_vpd_metadata_for_nodedevice.py
+++ b/src/maasserver/migrations/maasserver/0279_store_vpd_metadata_for_nodedevice.py
@@ -7,7 +7,6 @@ import maasserver.models.cleansave
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0278_generic_jsonfield"),
]
diff --git a/src/maasserver/migrations/maasserver/0280_set_parent_for_existing_vms.py b/src/maasserver/migrations/maasserver/0280_set_parent_for_existing_vms.py
index 5ce9ea2..6958b5d 100644
--- a/src/maasserver/migrations/maasserver/0280_set_parent_for_existing_vms.py
+++ b/src/maasserver/migrations/maasserver/0280_set_parent_for_existing_vms.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0279_store_vpd_metadata_for_nodedevice"),
]
diff --git a/src/maasserver/migrations/maasserver/0281_secret_model.py b/src/maasserver/migrations/maasserver/0281_secret_model.py
index c71569b..996c1dc 100644
--- a/src/maasserver/migrations/maasserver/0281_secret_model.py
+++ b/src/maasserver/migrations/maasserver/0281_secret_model.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0280_set_parent_for_existing_vms"),
]
diff --git a/src/maasserver/migrations/maasserver/0282_rpc_shared_secret_to_secret.py b/src/maasserver/migrations/maasserver/0282_rpc_shared_secret_to_secret.py
index d828510..3372cdc 100644
--- a/src/maasserver/migrations/maasserver/0282_rpc_shared_secret_to_secret.py
+++ b/src/maasserver/migrations/maasserver/0282_rpc_shared_secret_to_secret.py
@@ -32,7 +32,6 @@ def move_secrets(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0281_secret_model"),
]
diff --git a/src/maasserver/migrations/maasserver/0283_migrate_tls_secrets.py b/src/maasserver/migrations/maasserver/0283_migrate_tls_secrets.py
index 6d2fbc7..5534649 100644
--- a/src/maasserver/migrations/maasserver/0283_migrate_tls_secrets.py
+++ b/src/maasserver/migrations/maasserver/0283_migrate_tls_secrets.py
@@ -31,7 +31,6 @@ def move_tls_secrets(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0282_rpc_shared_secret_to_secret"),
]
diff --git a/src/maasserver/migrations/maasserver/0284_migrate_more_global_secrets.py b/src/maasserver/migrations/maasserver/0284_migrate_more_global_secrets.py
index 35abc60..80ea926 100644
--- a/src/maasserver/migrations/maasserver/0284_migrate_more_global_secrets.py
+++ b/src/maasserver/migrations/maasserver/0284_migrate_more_global_secrets.py
@@ -31,7 +31,6 @@ def move_secrets(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0283_migrate_tls_secrets"),
]
diff --git a/src/maasserver/migrations/maasserver/0285_migrate_external_auth_secrets.py b/src/maasserver/migrations/maasserver/0285_migrate_external_auth_secrets.py
index 919d9e2..3c031f1 100644
--- a/src/maasserver/migrations/maasserver/0285_migrate_external_auth_secrets.py
+++ b/src/maasserver/migrations/maasserver/0285_migrate_external_auth_secrets.py
@@ -39,7 +39,6 @@ def move_secrets(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0284_migrate_more_global_secrets"),
]
diff --git a/src/maasserver/migrations/maasserver/0286_node_deploy_metadata.py b/src/maasserver/migrations/maasserver/0286_node_deploy_metadata.py
index 0c0daf2..8bf9e14 100644
--- a/src/maasserver/migrations/maasserver/0286_node_deploy_metadata.py
+++ b/src/maasserver/migrations/maasserver/0286_node_deploy_metadata.py
@@ -35,7 +35,6 @@ def migrate_node_metadata(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0285_migrate_external_auth_secrets"),
]
diff --git a/src/maasserver/migrations/maasserver/0287_add_controller_info_vault_flag.py b/src/maasserver/migrations/maasserver/0287_add_controller_info_vault_flag.py
index 378c9e3..f790723 100644
--- a/src/maasserver/migrations/maasserver/0287_add_controller_info_vault_flag.py
+++ b/src/maasserver/migrations/maasserver/0287_add_controller_info_vault_flag.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0286_node_deploy_metadata"),
]
diff --git a/src/maasserver/migrations/maasserver/0288_rootkey_material_secret.py b/src/maasserver/migrations/maasserver/0288_rootkey_material_secret.py
index 6bd7560..4c93d5b 100644
--- a/src/maasserver/migrations/maasserver/0288_rootkey_material_secret.py
+++ b/src/maasserver/migrations/maasserver/0288_rootkey_material_secret.py
@@ -33,7 +33,6 @@ def migrate_rootkey_material(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0287_add_controller_info_vault_flag"),
]
diff --git a/src/maasserver/migrations/maasserver/0289_vault_secret.py b/src/maasserver/migrations/maasserver/0289_vault_secret.py
index 5791a7e..cfba20f 100644
--- a/src/maasserver/migrations/maasserver/0289_vault_secret.py
+++ b/src/maasserver/migrations/maasserver/0289_vault_secret.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0288_rootkey_material_secret"),
]
diff --git a/src/maasserver/migrations/maasserver/0290_migrate_node_power_parameters.py b/src/maasserver/migrations/maasserver/0290_migrate_node_power_parameters.py
index 6cd6f3e..84bf466 100644
--- a/src/maasserver/migrations/maasserver/0290_migrate_node_power_parameters.py
+++ b/src/maasserver/migrations/maasserver/0290_migrate_node_power_parameters.py
@@ -69,7 +69,6 @@ def move_secrets(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0289_vault_secret"),
]
diff --git a/src/maasserver/migrations/maasserver/0291_rdns_hostnames_as_array.py b/src/maasserver/migrations/maasserver/0291_rdns_hostnames_as_array.py
index 03b3f4c..d066872 100644
--- a/src/maasserver/migrations/maasserver/0291_rdns_hostnames_as_array.py
+++ b/src/maasserver/migrations/maasserver/0291_rdns_hostnames_as_array.py
@@ -30,7 +30,6 @@ QUERIES = (
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0290_migrate_node_power_parameters"),
]
diff --git a/src/maasserver/migrations/maasserver/0292_use_builtin_json_field.py b/src/maasserver/migrations/maasserver/0292_use_builtin_json_field.py
index afe7d16..f53fd16 100644
--- a/src/maasserver/migrations/maasserver/0292_use_builtin_json_field.py
+++ b/src/maasserver/migrations/maasserver/0292_use_builtin_json_field.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0291_rdns_hostnames_as_array"),
]
diff --git a/src/maasserver/migrations/piston3/0001_initial.py b/src/maasserver/migrations/piston3/0001_initial.py
index 7912650..61f6e1b 100644
--- a/src/maasserver/migrations/piston3/0001_initial.py
+++ b/src/maasserver/migrations/piston3/0001_initial.py
@@ -4,7 +4,6 @@ import piston3.models
class Migration(migrations.Migration):
-
dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
operations = [
diff --git a/src/maasserver/migrations/piston3/0002_auto_20151209_1652.py b/src/maasserver/migrations/piston3/0002_auto_20151209_1652.py
index 4a1d397..41c957b 100644
--- a/src/maasserver/migrations/piston3/0002_auto_20151209_1652.py
+++ b/src/maasserver/migrations/piston3/0002_auto_20151209_1652.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("piston3", "0001_initial")]
operations = [
diff --git a/src/maasserver/migrations/piston3/0003_piston_nonce_index.py b/src/maasserver/migrations/piston3/0003_piston_nonce_index.py
index 894f310..36a4341 100644
--- a/src/maasserver/migrations/piston3/0003_piston_nonce_index.py
+++ b/src/maasserver/migrations/piston3/0003_piston_nonce_index.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("piston3", "0002_auto_20151209_1652")]
operations = [
diff --git a/src/maasserver/models/dhcpsnippet.py b/src/maasserver/models/dhcpsnippet.py
index 054ccce..08f1a46 100644
--- a/src/maasserver/models/dhcpsnippet.py
+++ b/src/maasserver/models/dhcpsnippet.py
@@ -70,7 +70,6 @@ class DHCPSnippetManager(Manager, DHCPSnippetQueriesMixin):
class DHCPSnippet(CleanSave, TimestampedModel):
-
name = CharField(max_length=255)
value = ForeignKey(VersionedTextFile, on_delete=CASCADE)
diff --git a/src/maasserver/models/forwarddnsserver.py b/src/maasserver/models/forwarddnsserver.py
index 9fe07be..5dcf740 100644
--- a/src/maasserver/models/forwarddnsserver.py
+++ b/src/maasserver/models/forwarddnsserver.py
@@ -22,7 +22,8 @@ class ForwardDNSServerManager(Manager):
class ForwardDNSServer(CleanSave, TimestampedModel):
"""A `ForwardDNSServer`.
:ivar ip_address: The IP address of the forward DNS server to forward queries to.
- :ivar domains: A many to many reference to domains that forward to this server."""
+ :ivar domains: A many to many reference to domains that forward to this server.
+ """
objects = ForwardDNSServerManager()
diff --git a/src/maasserver/models/signals/tests/test_interfaces.py b/src/maasserver/models/signals/tests/test_interfaces.py
index 72d985e..18b10df 100644
--- a/src/maasserver/models/signals/tests/test_interfaces.py
+++ b/src/maasserver/models/signals/tests/test_interfaces.py
@@ -156,7 +156,6 @@ class TestMTUParams(MAASServerTestCase):
class TestInterfaceVLANUpdateNotController(MAASServerTestCase):
-
scenarios = (
("machine", {"maker": factory.make_Node}),
("device", {"maker": factory.make_Device}),
@@ -190,7 +189,6 @@ class TestInterfaceVLANUpdateNotController(MAASServerTestCase):
class TestInterfaceVLANUpdateController(MAASServerTestCase):
-
scenarios = (
("region", {"maker": factory.make_RegionController}),
("rack", {"maker": factory.make_RackController}),
diff --git a/src/maasserver/models/signals/tests/test_scriptresult.py b/src/maasserver/models/signals/tests/test_scriptresult.py
index 8af3f7f..7051652 100644
--- a/src/maasserver/models/signals/tests/test_scriptresult.py
+++ b/src/maasserver/models/signals/tests/test_scriptresult.py
@@ -142,7 +142,6 @@ class TestStatusTransitionEvent(MAASServerTestCase):
)
def test_script_did_not_complete_emits_event(self):
-
script_result = factory.make_ScriptResult(
status=SCRIPT_STATUS.RUNNING,
script_set=factory.make_ScriptSet(result_type=RESULT_TYPE.TESTING),
@@ -172,7 +171,6 @@ class TestStatusTransitionEvent(MAASServerTestCase):
)
def test_script_changed_status_emits_event(self):
-
old_status = SCRIPT_STATUS.RUNNING
script_result = factory.make_ScriptResult(
status=old_status,
@@ -207,7 +205,6 @@ class TestStatusTransitionEvent(MAASServerTestCase):
)
def test_install_log_emits_event(self):
-
old_status = SCRIPT_STATUS.RUNNING
script_result = factory.make_ScriptResult(
status=old_status,
diff --git a/src/maasserver/models/signals/tests/test_subnet.py b/src/maasserver/models/signals/tests/test_subnet.py
index 1cb847b..6a68ea3 100644
--- a/src/maasserver/models/signals/tests/test_subnet.py
+++ b/src/maasserver/models/signals/tests/test_subnet.py
@@ -10,7 +10,6 @@ from maasserver.testing.testcase import MAASServerTestCase
class TestSubnetSignals(MAASServerTestCase):
-
scenarios = (
("ipv4", {"network_maker": factory.make_ipv4_network}),
("ipv6", {"network_maker": factory.make_ipv6_network}),
diff --git a/src/maasserver/models/subnet.py b/src/maasserver/models/subnet.py
index 870d4eb..07bc202 100644
--- a/src/maasserver/models/subnet.py
+++ b/src/maasserver/models/subnet.py
@@ -94,7 +94,6 @@ def create_cidr(network, subnet_mask=None):
class SubnetQueriesMixin(MAASQueriesMixin):
-
find_subnets_with_ip_query = """
SELECT DISTINCT subnet.*, masklen(subnet.cidr) "prefixlen"
FROM
diff --git a/src/maasserver/models/tests/test_blockdevice.py b/src/maasserver/models/tests/test_blockdevice.py
index 66ea4a4..0f62837 100644
--- a/src/maasserver/models/tests/test_blockdevice.py
+++ b/src/maasserver/models/tests/test_blockdevice.py
@@ -384,7 +384,7 @@ class TestBlockDevice(MAASServerTestCase):
(1000 * 1000 * 1000 * 1000, "1.0 TB"),
)
block_device = BlockDevice()
- for (size, display_size) in sizes:
+ for size, display_size in sizes:
block_device.size = size
self.expectThat(block_device.display_size(), Equals(display_size))
@@ -558,7 +558,6 @@ class TestBlockDevice(MAASServerTestCase):
class TestBlockDeviceBlockNameIdx(MAASTestCase):
-
scenarios = (
("0", {"idx": 0, "name": "sda"}),
("25", {"idx": 25, "name": "sdz"}),
@@ -585,7 +584,6 @@ class TestBlockDeviceBlockNameIdx(MAASTestCase):
class TestBlockDevicePostSaveCallsSave(MAASServerTestCase):
-
scenarios = [
("BlockDevice", {"factory": factory.make_BlockDevice}),
("PhysicalBlockDevice", {"factory": factory.make_PhysicalBlockDevice}),
diff --git a/src/maasserver/models/tests/test_filesystemgroup.py b/src/maasserver/models/tests/test_filesystemgroup.py
index a0bf0e9..1625909 100644
--- a/src/maasserver/models/tests/test_filesystemgroup.py
+++ b/src/maasserver/models/tests/test_filesystemgroup.py
@@ -1681,7 +1681,6 @@ class TestFilesystemGroup(MAASServerTestCase):
class TestFilesystemGroupGetNiceName(MAASServerTestCase):
-
scenarios = [
(
FILESYSTEM_GROUP_TYPE.LVM_VG,
@@ -1728,7 +1727,6 @@ class TestFilesystemGroupGetNiceName(MAASServerTestCase):
class TestFilesystemGroupGetNamePrefix(MAASServerTestCase):
-
scenarios = [
(
FILESYSTEM_GROUP_TYPE.LVM_VG,
@@ -1772,7 +1770,6 @@ class TestFilesystemGroupGetNamePrefix(MAASServerTestCase):
class TestFilesystemGroupGetVirtualBlockDeviceBlockSize(MAASServerTestCase):
-
scenarios = [
(
FILESYSTEM_GROUP_TYPE.LVM_VG,
diff --git a/src/maasserver/models/tests/test_interface.py b/src/maasserver/models/tests/test_interface.py
index 82c70ce..a6cd866 100644
--- a/src/maasserver/models/tests/test_interface.py
+++ b/src/maasserver/models/tests/test_interface.py
@@ -1366,7 +1366,6 @@ class TestInterface(MAASServerTestCase):
class TestUpdateInterfaceParentsOnSave(MAASServerTestCase):
-
scenarios = (
("bond", {"iftype": INTERFACE_TYPE.BOND}),
("bridge", {"iftype": INTERFACE_TYPE.BRIDGE}),
@@ -4142,7 +4141,6 @@ class TestReportVID(MAASServerTestCase):
class TestInterfaceGetDefaultBridgeName(MAASServerTestCase):
-
# Normally we would use scenarios for this, but this was copied and
# pasted from Juju code in bridgepolicy_test.go.
expected_bridge_names = {
diff --git a/src/maasserver/models/tests/test_iprange.py b/src/maasserver/models/tests/test_iprange.py
index e9203ef..b5864ce 100644
--- a/src/maasserver/models/tests/test_iprange.py
+++ b/src/maasserver/models/tests/test_iprange.py
@@ -370,7 +370,6 @@ class TestIPRange(MAASServerTestCase):
class TestIPRangeSavePreventsOverlapping(MAASServerTestCase):
-
overlaps = "Requested %s range conflicts with an existing %srange."
dynamic_overlaps = overlaps % (IPRANGE_TYPE.DYNAMIC, "IP address or ")
reserved_overlaps = overlaps % (IPRANGE_TYPE.RESERVED, "")
diff --git a/src/maasserver/models/tests/test_largefile.py b/src/maasserver/models/tests/test_largefile.py
index 9caf641..d333a40 100644
--- a/src/maasserver/models/tests/test_largefile.py
+++ b/src/maasserver/models/tests/test_largefile.py
@@ -64,7 +64,6 @@ class TestLargeFileManager(MAASServerTestCase):
class TestLargeFile(MAASServerTestCase):
-
mock_delete_large_object_content_later = False
def test_content(self):
@@ -157,7 +156,6 @@ class TestLargeFile(MAASServerTestCase):
class TestDeleteLargeObjectContentLater(MAASTransactionServerTestCase):
-
mock_delete_large_object_content_later = False
def test_schedules_unlink(self):
diff --git a/src/maasserver/models/tests/test_managers.py b/src/maasserver/models/tests/test_managers.py
index 4a41389..f74a714 100644
--- a/src/maasserver/models/tests/test_managers.py
+++ b/src/maasserver/models/tests/test_managers.py
@@ -12,7 +12,6 @@ from maasserver.tests.models import (
class TestBulkManager(MAASLegacyTransactionServerTestCase):
-
apps = ["maasserver.tests"]
def test_manager_iterator_uses_cache(self):
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 25fc5e1..8afb42b 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -714,7 +714,6 @@ class TestRegionControllerManager(MAASServerTestCase):
class TestRegionControllerManagerGetOrCreateRunningController(
MAASServerTestCase
):
-
scenarios_hosts = (
("rack", dict(make_host_node=factory.make_RackController)),
("region", dict(make_host_node=factory.make_RegionController)),
@@ -11727,7 +11726,6 @@ class TestNodeStorageClone__MappingBetweenNodes(MAASServerTestCase):
class TestNodeStorageClone_SimpleMBRLayout(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -11948,7 +11946,6 @@ class TestNodeStorageClone_SimpleMBRLayout(
class TestNodeStorageClone_ComplexDiskLayout(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -12338,7 +12335,6 @@ class TestNodeStorageClone_ComplexDiskLayout(
class TestNodeStorageClone_SpecialFilesystems(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
diff --git a/src/maasserver/models/tests/test_subnet.py b/src/maasserver/models/tests/test_subnet.py
index 5a256fd..98112f4 100644
--- a/src/maasserver/models/tests/test_subnet.py
+++ b/src/maasserver/models/tests/test_subnet.py
@@ -1307,7 +1307,6 @@ class TestSubnetGetLeastRecentlySeenUnknownNeighbour(MAASServerTestCase):
class TestSubnetGetNextIPForAllocation(MAASServerTestCase):
-
scenarios = (
("managed", {"managed": True}),
("unmanaged", {"managed": False}),
diff --git a/src/maasserver/models/tests/test_vlan.py b/src/maasserver/models/tests/test_vlan.py
index 5ba254d..1bb8bdb 100644
--- a/src/maasserver/models/tests/test_vlan.py
+++ b/src/maasserver/models/tests/test_vlan.py
@@ -231,7 +231,6 @@ class TestVLAN(MAASServerTestCase):
class TestVLANVidValidation(MAASServerTestCase):
-
scenarios = [
("0", {"vid": 0, "valid": True}),
("12", {"vid": 12, "valid": True}),
@@ -263,7 +262,6 @@ class TestVLANVidValidation(MAASServerTestCase):
class TestVLANMTUValidation(MAASServerTestCase):
-
scenarios = [
("551", {"mtu": 551, "valid": False}),
("552", {"mtu": 552, "valid": True}),
diff --git a/src/maasserver/models/virtualblockdevice.py b/src/maasserver/models/virtualblockdevice.py
index 250f778..4ac1097 100644
--- a/src/maasserver/models/virtualblockdevice.py
+++ b/src/maasserver/models/virtualblockdevice.py
@@ -84,7 +84,6 @@ class VirtualBlockDevice(BlockDevice):
# Check if the size of this is not larger than the free size of
# its filesystem group if its lvm.
if self.filesystem_group.is_lvm():
-
# align virtual partition to partition alignment size
# otherwise on creation it may be rounded up, overfilling group
self.size = round_size_to_nearest_block(
diff --git a/src/maasserver/models/virtualmachine.py b/src/maasserver/models/virtualmachine.py
index 9db0bae..55c7900 100644
--- a/src/maasserver/models/virtualmachine.py
+++ b/src/maasserver/models/virtualmachine.py
@@ -353,7 +353,6 @@ class VMHostResources:
@dataclass
class VMHostUsedResources:
-
cores: int
memory: int
hugepages_memory: int
diff --git a/src/maasserver/node_constraint_filter_forms.py b/src/maasserver/node_constraint_filter_forms.py
index 5128c1f..091d6fa 100644
--- a/src/maasserver/node_constraint_filter_forms.py
+++ b/src/maasserver/node_constraint_filter_forms.py
@@ -1315,7 +1315,6 @@ class AcquireNodeForm(FilterNodeForm):
class ReadNodesForm(FilterNodeForm):
-
id = UnconstrainedMultipleChoiceField(
label="System IDs to filter on", required=False
)
@@ -1431,7 +1430,6 @@ class ReadNodesForm(FilterNodeForm):
class FreeTextFilterNodeForm(ReadNodesForm):
-
free_text = UnconstrainedMultipleChoiceField(
label="Free-text search on all string fields",
required=False,
@@ -1861,7 +1859,7 @@ class FreeTextFilterNodeForm(ReadNodesForm):
def filter_by_storage(self, filtered_nodes):
storage = self.cleaned_data.get("storage")
node_ids = []
- for (size, tags) in storage:
+ for size, tags in storage:
if "partition" in tags:
part_tags = list(tags)
part_tags.remove("partition")
diff --git a/src/maasserver/preseed.py b/src/maasserver/preseed.py
index 4c2f2e1..35713f8 100644
--- a/src/maasserver/preseed.py
+++ b/src/maasserver/preseed.py
@@ -607,7 +607,6 @@ def get_curtin_config(request, node, base_osystem=None, base_series=None):
@attr.s(auto_attribs=True)
class PackageManager:
-
package_tool: str
deps: typing.List[str]
diff --git a/src/maasserver/regiondservices/ntp.py b/src/maasserver/regiondservices/ntp.py
index f2a57d8..ee9e2a4 100644
--- a/src/maasserver/regiondservices/ntp.py
+++ b/src/maasserver/regiondservices/ntp.py
@@ -24,7 +24,6 @@ log = LegacyLogger()
class RegionNetworkTimeProtocolService(TimerService):
-
interval = timedelta(seconds=30).total_seconds()
_configuration = None
diff --git a/src/maasserver/regiondservices/syslog.py b/src/maasserver/regiondservices/syslog.py
index 9e50306..61bd0a7 100644
--- a/src/maasserver/regiondservices/syslog.py
+++ b/src/maasserver/regiondservices/syslog.py
@@ -25,7 +25,6 @@ log = LegacyLogger()
class RegionSyslogService(TimerService):
-
interval = timedelta(seconds=30).total_seconds()
_configuration = None
diff --git a/src/maasserver/release_notifications.py b/src/maasserver/release_notifications.py
index f5acc12..6046032 100644
--- a/src/maasserver/release_notifications.py
+++ b/src/maasserver/release_notifications.py
@@ -50,7 +50,6 @@ def notification_available(notification_version):
@transactional
def ensure_notification_exists(message, resurface_after=RESURFACE_AFTER):
-
notification, created = Notification.objects.get_or_create(
ident=RELEASE_NOTIFICATION_IDENT,
defaults={
@@ -99,7 +98,6 @@ class ReleaseNotifications:
@asynchronous
@inlineCallbacks
def check_notifications(self, notifications_enabled):
-
if not notifications_enabled:
maaslog.debug("Release notifications are disabled")
# Notifications are disabled, we can delete any that currently exist.
diff --git a/src/maasserver/testing/commissioning.py b/src/maasserver/testing/commissioning.py
index 4657009..b24c9d6 100644
--- a/src/maasserver/testing/commissioning.py
+++ b/src/maasserver/testing/commissioning.py
@@ -50,7 +50,6 @@ class LXDBond:
@dataclasses.dataclass
class LXDAddress:
-
address: str
netmask: str
family: str = "inet"
@@ -71,7 +70,6 @@ class LXDNetwork:
@dataclasses.dataclass
class LXDNetworkPort:
-
id: str
port: int
address: str = dataclasses.field(default_factory=factory.make_mac_address)
diff --git a/src/maasserver/testing/factory.py b/src/maasserver/testing/factory.py
index 521f706..e78b84b 100644
--- a/src/maasserver/testing/factory.py
+++ b/src/maasserver/testing/factory.py
@@ -3259,7 +3259,6 @@ class Factory(maastesting.factory.Factory):
category=None,
dismissable=True,
):
-
if context is None:
context_name = self.make_name("name")
context = {context_name: self.make_name("value")}
diff --git a/src/maasserver/testing/sampledata/rackcontroller.py b/src/maasserver/testing/sampledata/rackcontroller.py
index 0d3aa5b..0bde47d 100644
--- a/src/maasserver/testing/sampledata/rackcontroller.py
+++ b/src/maasserver/testing/sampledata/rackcontroller.py
@@ -27,7 +27,6 @@ def make_rackcontroller_infos(count: int, hostname_prefix: str):
def make_rackcontrollers(
rackcontroller_infos: List[FakeCommissioningData], tags: List[Tag]
):
-
rackcontrollers = []
running_version = version.get_running_version()
diff --git a/src/maasserver/testing/sampledata/vmhost.py b/src/maasserver/testing/sampledata/vmhost.py
index 3f1589c..43ca647 100644
--- a/src/maasserver/testing/sampledata/vmhost.py
+++ b/src/maasserver/testing/sampledata/vmhost.py
@@ -6,7 +6,6 @@ from .common import make_name
def make_vmhosts(count: int):
-
power_types = cycle(("virsh", "lxd"))
vmhosts = []
diff --git a/src/maasserver/testing/testcase.py b/src/maasserver/testing/testcase.py
index 143a288..530eaa0 100644
--- a/src/maasserver/testing/testcase.py
+++ b/src/maasserver/testing/testcase.py
@@ -226,6 +226,7 @@ class SerializationFailureTestCase(
def cause_serialization_failure(self):
"""Trigger an honest, from the database, serialization failure."""
+
# Helper to switch the transaction to SERIALIZABLE.
def set_serializable():
with connection.cursor() as cursor:
@@ -346,6 +347,7 @@ class UniqueViolationTestCase(
ought to tell us about it.
"""
+
# Helper to switch the transaction to REPEATABLE READ.
def set_repeatable_read():
with connection.cursor() as cursor:
diff --git a/src/maasserver/tests/test_compose_preseed.py b/src/maasserver/tests/test_compose_preseed.py
index a010af8..eecd7a7 100644
--- a/src/maasserver/tests/test_compose_preseed.py
+++ b/src/maasserver/tests/test_compose_preseed.py
@@ -66,7 +66,6 @@ def _enable_dhcp(subnet, primary_rack, secondary_rack=None, relay_vlan=None):
class TestAptProxyScenarios(MAASServerTestCase):
-
scenarios = (
(
"ipv6",
@@ -356,7 +355,6 @@ class TestAptProxy(MAASServerTestCase):
self.assertEqual("http://10.10.0.2:8000/", apt_proxy)
def test_enlist_rack_proxy_no_rack_subnet(self):
-
Config.objects.set_config("enable_http_proxy", True)
Config.objects.set_config("use_peer_proxy", False)
Config.objects.set_config("use_rack_proxy", True)
diff --git a/src/maasserver/tests/test_fields.py b/src/maasserver/tests/test_fields.py
index dee3717..1f14e3b 100644
--- a/src/maasserver/tests/test_fields.py
+++ b/src/maasserver/tests/test_fields.py
@@ -103,7 +103,6 @@ class TestMACAddressField(MAASServerTestCase):
class TestXMLField(MAASLegacyServerTestCase):
-
apps = ["maasserver.tests"]
def test_loads_string(self):
@@ -149,7 +148,6 @@ class TestEditableBinaryField(MAASServerTestCase):
class TestLargeObjectField(MAASLegacyServerTestCase):
-
apps = ["maasserver.tests"]
def test_stores_data(self):
@@ -267,7 +265,6 @@ class TestLargeObjectField(MAASLegacyServerTestCase):
class TestCIDRField(MAASLegacyServerTestCase):
-
apps = ["maasserver.tests"]
def test_stores_cidr(self):
@@ -290,7 +287,6 @@ class TestCIDRField(MAASLegacyServerTestCase):
class TestIPv4CIDRField(MAASLegacyServerTestCase):
-
apps = ["maasserver.tests"]
def test_stores_cidr(self):
diff --git a/src/maasserver/tests/test_ipc.py b/src/maasserver/tests/test_ipc.py
index 78355bc..89f135d 100644
--- a/src/maasserver/tests/test_ipc.py
+++ b/src/maasserver/tests/test_ipc.py
@@ -72,7 +72,6 @@ class TestGetIPCSocketPath(MAASTestCase):
class TestIPCCommunication(MAASTransactionServerTestCase):
-
run_tests_with = MAASCrochetRunTest
def setUp(self):
diff --git a/src/maasserver/tests/test_node_action.py b/src/maasserver/tests/test_node_action.py
index c30a7ab..f0d7a1a 100644
--- a/src/maasserver/tests/test_node_action.py
+++ b/src/maasserver/tests/test_node_action.py
@@ -329,7 +329,6 @@ class TestDeleteAction(MAASServerTestCase):
class TestCommissionAction(MAASServerTestCase):
-
scenarios = (
("NEW", {"status": NODE_STATUS.NEW}),
("FAILED_COMMISSIONING", {"status": NODE_STATUS.FAILED_COMMISSIONING}),
@@ -1383,7 +1382,6 @@ ACTIONABLE_STATUSES = [
class TestReleaseAction(MAASServerTestCase):
-
scenarios = [
(NODE_STATUS_CHOICES_DICT[status], dict(actionable_status=status))
for status in ACTIONABLE_STATUSES
diff --git a/src/maasserver/tests/test_node_constraint_filter_forms.py b/src/maasserver/tests/test_node_constraint_filter_forms.py
index f5dde8e..2414112 100644
--- a/src/maasserver/tests/test_node_constraint_filter_forms.py
+++ b/src/maasserver/tests/test_node_constraint_filter_forms.py
@@ -181,7 +181,6 @@ class TestUtils(MAASServerTestCase):
class FilterConstraintsMixin:
-
form_class = None # set in subclasses
def assertConstrainedNodes(self, nodes, data):
@@ -203,7 +202,6 @@ def create_unique_node_device_needle(needle_name, needle_factory):
class TestFilterNodeForm(MAASServerTestCase, FilterConstraintsMixin):
-
form_class = FilterNodeForm
def set_usable_arch(self):
@@ -2010,7 +2008,6 @@ class TestFreeTextFilterNodeForm(MAASServerTestCase):
class TestAcquireNodeForm(MAASServerTestCase, FilterConstraintsMixin):
-
form_class = AcquireNodeForm
def set_usable_arch(self):
@@ -2332,7 +2329,6 @@ class TestAcquireNodeFormOrdersResults(MAASServerTestCase):
class TestReadNodesForm(MAASServerTestCase, FilterConstraintsMixin):
-
form_class = ReadNodesForm
def test_system_ids(self):
diff --git a/src/maasserver/tests/test_preseed_network.py b/src/maasserver/tests/test_preseed_network.py
index a1d5a72..2737d7b 100644
--- a/src/maasserver/tests/test_preseed_network.py
+++ b/src/maasserver/tests/test_preseed_network.py
@@ -38,7 +38,6 @@ from provisioningserver.utils.network import get_source_address
class AssertNetworkConfigMixin:
-
# MAC addresses are quoted because unquoted all-numeric MAC addresses —
# e.g. 12:34:56:78:90:12 — are interpreted as *integers* by PyYAML. This
# edge-case took some time to figure out, and begs the question: why is
@@ -324,7 +323,6 @@ class AssertNetworkConfigMixin:
class TestSingleAddrFamilyLayout(MAASServerTestCase, AssertNetworkConfigMixin):
-
scenarios = (("ipv4", {"version": 4}), ("ipv6", {"version": 6}))
def test_renders_expected_output(self):
@@ -471,7 +469,6 @@ class TestVLANOnBondNetworkLayout(
class TestDHCPNetworkLayout(MAASServerTestCase, AssertNetworkConfigMixin):
-
scenarios = (("ipv4", {"ip_version": 4}), ("ipv6", {"ip_version": 6}))
def test_dhcp_configurations_rendered(self):
diff --git a/src/maasserver/tests/test_preseed_storage.py b/src/maasserver/tests/test_preseed_storage.py
index 65fbec5..789fc86 100644
--- a/src/maasserver/tests/test_preseed_storage.py
+++ b/src/maasserver/tests/test_preseed_storage.py
@@ -83,7 +83,6 @@ class AssertStorageConfigMixin:
class TestSpecialFilesystems(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -136,7 +135,6 @@ class TestSpecialFilesystems(MAASServerTestCase, AssertStorageConfigMixin):
class TestExt4MetadataCSUM(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -207,7 +205,6 @@ class TestExt4MetadataCSUM(MAASServerTestCase, AssertStorageConfigMixin):
class TestSimpleGPTLayout(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -377,7 +374,6 @@ class TestSimpleGPTLayout(MAASServerTestCase, AssertStorageConfigMixin):
class TestSimpleMBRLayout(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -589,7 +585,6 @@ class TestSimpleMBRLayout(MAASServerTestCase, AssertStorageConfigMixin):
class TestSimpleWithEmptyDiskLayout(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -671,7 +666,6 @@ class TestSimpleWithEmptyDiskLayout(
class TestMBRWithBootDiskWithoutPartitionsLayout(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -756,7 +750,6 @@ class TestMBRWithBootDiskWithoutPartitionsLayout(
class TestGPTWithBootDiskWithoutPartitionsLayout(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -851,7 +844,6 @@ class TestGPTWithBootDiskWithoutPartitionsLayout(
class TestGPTPXELargeBootDiskLayout(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -935,7 +927,6 @@ class TestGPTPXELargeBootDiskLayout(
class TestLVMOnlyVG(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -998,7 +989,6 @@ class TestLVMOnlyVG(MAASServerTestCase, AssertStorageConfigMixin):
class TestComplexDiskLayout(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -1352,7 +1342,6 @@ class TestComplexDiskLayout(MAASServerTestCase, AssertStorageConfigMixin):
class TestSimplePower8Layout(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -1435,7 +1424,6 @@ class TestSimplePower8Layout(MAASServerTestCase, AssertStorageConfigMixin):
class TestPower8ExtraSpaceLayout(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -1516,7 +1504,6 @@ class TestPower8ExtraSpaceLayout(MAASServerTestCase, AssertStorageConfigMixin):
class TestPower8NoPartitionTableLayout(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -1675,7 +1662,6 @@ class TestMountOrdering(MAASServerTestCase):
class TestBootableRaidLayoutMBR(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -1819,7 +1805,6 @@ class TestBootableRaidLayoutMBR(MAASServerTestCase, AssertStorageConfigMixin):
class TestBootableRaidLayoutUEFI(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -1947,7 +1932,6 @@ class TestBootableRaidLayoutUEFI(MAASServerTestCase, AssertStorageConfigMixin):
class TestBootableRaidLayoutGPT(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -2097,7 +2081,6 @@ class TestBootableRaidLayoutGPT(MAASServerTestCase, AssertStorageConfigMixin):
class TestBootableRaidLayoutGPTWithPartition(
MAASServerTestCase, AssertStorageConfigMixin
):
-
STORAGE_CONFIG = dedent(
"""\
config:
@@ -2265,7 +2248,6 @@ class TestBootableRaidLayoutGPTWithPartition(
class TestVMFS(MAASServerTestCase, AssertStorageConfigMixin):
-
STORAGE_CONFIG = dedent(
"""\
config:
diff --git a/src/maasserver/tests/test_stats.py b/src/maasserver/tests/test_stats.py
index f70a6a0..7a33d87 100644
--- a/src/maasserver/tests/test_stats.py
+++ b/src/maasserver/tests/test_stats.py
@@ -870,7 +870,6 @@ class TestGetBrownfieldStats(MAASServerTestCase):
machine.bmc = factory.make_BMC()
machine.save()
for _ in range(2):
-
machine = self._make_brownfield_machine()
machine.bmc = None
machine.save()
diff --git a/src/maasserver/tests/test_status_monitor.py b/src/maasserver/tests/test_status_monitor.py
index c023015..69bc499 100644
--- a/src/maasserver/tests/test_status_monitor.py
+++ b/src/maasserver/tests/test_status_monitor.py
@@ -78,7 +78,6 @@ class TestMarkNodesFailedAfterExpiring(MAASServerTestCase):
class TestMarkNodesFailedAfterMissingScriptTimeout(MAASServerTestCase):
-
scenarios = (
(
"commissioning",
diff --git a/src/maasserver/tests/test_vmhost.py b/src/maasserver/tests/test_vmhost.py
index dc05a54..ac4abb9 100644
--- a/src/maasserver/tests/test_vmhost.py
+++ b/src/maasserver/tests/test_vmhost.py
@@ -208,7 +208,6 @@ class TestDiscoverAndSyncVMHost(MAASServerTestCase):
class TestDiscoverAndSyncVMHostAsync(MAASTransactionServerTestCase):
-
wait_for_reactor = wait_for()
@wait_for_reactor
@@ -307,7 +306,7 @@ class TestCleanPowerAddress(MAASServerTestCase):
"qemu+ssh://10.0.0.1:2200/system",
),
]
- for (case, output) in cases:
+ for case, output in cases:
ret = vmhost_module._clean_power_address(case)
self.assertEqual(output, ret)
@@ -703,7 +702,6 @@ class TestSyncVMCluster(MAASServerTestCase):
class TestSyncVMClusterAsync(MAASTransactionServerTestCase):
-
wait_for_reactor = wait_for()
@wait_for_reactor
@@ -1063,7 +1061,6 @@ class TestSyncVMClusterAsync(MAASTransactionServerTestCase):
class TestRequestCommissioningResults(MAASTransactionServerTestCase):
-
wait_for_reactor = wait_for()
@wait_for_reactor
diff --git a/src/maasserver/triggers/testing.py b/src/maasserver/triggers/testing.py
index 551ef4d..3e6fa68 100644
--- a/src/maasserver/triggers/testing.py
+++ b/src/maasserver/triggers/testing.py
@@ -945,7 +945,6 @@ class RBACHelpersMixin:
class NotifyHelperMixin:
-
channels = ()
channel_queues = {}
postgres_listener_service = None
diff --git a/src/maasserver/triggers/tests/test_websocket_listener.py b/src/maasserver/triggers/tests/test_websocket_listener.py
index 277fce2..90ea0a7 100644
--- a/src/maasserver/triggers/tests/test_websocket_listener.py
+++ b/src/maasserver/triggers/tests/test_websocket_listener.py
@@ -915,7 +915,6 @@ class TestNodeTagListener(
class TestOwnerDataTriggers(
MAASTransactionServerTestCase, TransactionalHelpersMixin
):
-
scenarios = (
(
"machine",
@@ -4347,7 +4346,6 @@ class TestIPRangeSubnetListener(
class TestBMCListener(
MAASTransactionServerTestCase, TransactionalHelpersMixin
):
-
scenarios = (
(
"machine",
@@ -4656,7 +4654,6 @@ class TestPodListener(
@wait_for_reactor
@inlineCallbacks
def test_calls_handler_on_create_notification(self):
-
listener = self.make_listener_without_delay()
dv = DeferredValue()
listener.register("pod", lambda *args: dv.set(args))
diff --git a/src/maasserver/triggers/websocket.py b/src/maasserver/triggers/websocket.py
index 18e6202..08acb6a 100644
--- a/src/maasserver/triggers/websocket.py
+++ b/src/maasserver/triggers/websocket.py
@@ -1653,7 +1653,7 @@ node_fields = (
@transactional
def register_websocket_triggers():
"""Register all websocket triggers into the database."""
- for (proc_name_prefix, event_name_prefix, node_type) in (
+ for proc_name_prefix, event_name_prefix, node_type in (
("machine", "machine", NODE_TYPE.MACHINE),
("rack_controller", "controller", NODE_TYPE.RACK_CONTROLLER),
("region_controller", "controller", NODE_TYPE.REGION_CONTROLLER),
@@ -1663,7 +1663,6 @@ def register_websocket_triggers():
NODE_TYPE.REGION_AND_RACK_CONTROLLER,
),
):
-
# Non-Device Node types
register_procedure(
render_notification_procedure(
diff --git a/src/maasserver/urls_api.py b/src/maasserver/urls_api.py
index 8c9ea41..f07fa70 100644
--- a/src/maasserver/urls_api.py
+++ b/src/maasserver/urls_api.py
@@ -337,7 +337,7 @@ license_keys_handler = AdminRestrictedResource(
def re_path(route, view, name=None, **kwargs):
paths = [django_re_path(route, view, name=name, **kwargs)]
if isinstance(view, OperationsResource):
- for (_, op) in view.handler.exports.keys():
+ for _, op in view.handler.exports.keys():
if op:
paths.append(
django_re_path(
diff --git a/src/maasserver/utils/tests/test_asynchronous.py b/src/maasserver/utils/tests/test_asynchronous.py
index b4fd6a0..60b7f11 100644
--- a/src/maasserver/utils/tests/test_asynchronous.py
+++ b/src/maasserver/utils/tests/test_asynchronous.py
@@ -45,7 +45,6 @@ class TestGather(MAASTestCase):
class TestGatherScenarios(MAASTestCase):
-
scenarios = (
(
"synchronous",
diff --git a/src/maasserver/utils/tests/test_converters.py b/src/maasserver/utils/tests/test_converters.py
index 7807ccf..cd0c270 100644
--- a/src/maasserver/utils/tests/test_converters.py
+++ b/src/maasserver/utils/tests/test_converters.py
@@ -42,7 +42,6 @@ class TestXMLToYAML(MAASTestCase):
class TestHumanReadableBytes(MAASTestCase):
-
scenarios = [
("bytes", dict(size=987, output="987", suffix="bytes")),
("kB", dict(size=1000 * 35 + 500, output="35.5", suffix="kB")),
diff --git a/src/maasserver/utils/tests/test_dblocks.py b/src/maasserver/utils/tests/test_dblocks.py
index 979c4d2..7667bcd 100644
--- a/src/maasserver/utils/tests/test_dblocks.py
+++ b/src/maasserver/utils/tests/test_dblocks.py
@@ -76,7 +76,6 @@ def capture_queries_while_holding_lock(lock):
class TestDatabaseLock(MAASTransactionServerTestCase):
-
scenarios = tuple(
("%s/%s" % mode, {"mode": mode})
for mode in dblocks.DatabaseLock.MODE_CHOICES
@@ -252,7 +251,6 @@ class TestDatabaseLockVariations(MAASServerTestCase):
class TestDatabaseXactLock(MAASTransactionServerTestCase):
-
scenarios = tuple(
("%s/%s" % mode, {"mode": mode})
for mode in dblocks.DatabaseXactLock.MODE_CHOICES
diff --git a/src/maasserver/utils/tests/test_storage.py b/src/maasserver/utils/tests/test_storage.py
index 88761c9..0db01d2 100644
--- a/src/maasserver/utils/tests/test_storage.py
+++ b/src/maasserver/utils/tests/test_storage.py
@@ -16,7 +16,6 @@ from maasserver.utils.storage import get_effective_filesystem, used_for
class TestGetEffectiveFilesystem(MAASServerTestCase):
-
scenarios = (
(
"BlockDevice",
diff --git a/src/maasserver/utils/tests/test_utils.py b/src/maasserver/utils/tests/test_utils.py
index 35f34cf..2a1b67d 100644
--- a/src/maasserver/utils/tests/test_utils.py
+++ b/src/maasserver/utils/tests/test_utils.py
@@ -253,7 +253,6 @@ class TestGetMAASUserAgent(MAASServerTestCase):
class TestGetHostWithoutPort(MAASTestCase):
-
scenarios = (
("ipv4", {"host": "127.0.0.1", "expected": "127.0.0.1"}),
(
diff --git a/src/maasserver/views/rpc.py b/src/maasserver/views/rpc.py
index 3c7b025..7e539e3 100644
--- a/src/maasserver/views/rpc.py
+++ b/src/maasserver/views/rpc.py
@@ -21,6 +21,7 @@ def get_endpoints():
Each tuple corresponds to somewhere an event-loop is listening
within the whole region. The `name` is the event-loop name.
"""
+
# Each regiond might be running a local bridge that duplicates the
# same IP address across region controllers. Each region controller
# must output a set of unique of IP addresses, to prevent the rack
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 3b7691d..6b86917 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -152,7 +152,6 @@ class FakeRequest:
class TestMachineHandler(MAASServerTestCase):
-
maxDiff = None
def get_blockdevice_status(self, handler, blockdevice):
diff --git a/src/maasserver/websockets/tests/test_websockets.py b/src/maasserver/websockets/tests/test_websockets.py
index 8ab051c..ff7a25b 100644
--- a/src/maasserver/websockets/tests/test_websockets.py
+++ b/src/maasserver/websockets/tests/test_websockets.py
@@ -50,7 +50,6 @@ from maastesting.twisted import TwistedLoggerFixture
class DummyRequest(DummyRequestBase):
-
content = None
def _cleanup(self):
diff --git a/src/maastesting/djangoclient.py b/src/maastesting/djangoclient.py
index e959884..b28f26c 100644
--- a/src/maastesting/djangoclient.py
+++ b/src/maastesting/djangoclient.py
@@ -35,7 +35,6 @@ def transparent_encode_multipart(func):
query=None,
**extra
):
-
if isinstance(data, bytes):
if content_type is None:
content_type = "application/octet-stream"
diff --git a/src/maastesting/factory.py b/src/maastesting/factory.py
index c35e66f..39e5d62 100644
--- a/src/maastesting/factory.py
+++ b/src/maastesting/factory.py
@@ -61,7 +61,6 @@ def network_clashes(network, other_networks):
class Factory:
-
random_letters = map(
random.choice, repeat(string.ascii_letters + string.digits)
)
diff --git a/src/maastesting/matchers.py b/src/maastesting/matchers.py
index 3ee25ce..a5f07d5 100644
--- a/src/maastesting/matchers.py
+++ b/src/maastesting/matchers.py
@@ -244,7 +244,6 @@ class MockCallsMatch(Matcher):
return f"{self.__class__.__name__}({self.calls!r})"
def match(self, mock):
-
matcher = MatchesAll(
IsCallableMock(),
Annotate(
diff --git a/src/maastesting/pytest/django.py b/src/maastesting/pytest/django.py
index 2b3a9cc..5eb7915 100644
--- a/src/maastesting/pytest/django.py
+++ b/src/maastesting/pytest/django.py
@@ -153,7 +153,6 @@ def _set_up_template_db(
@pytest.fixture(scope="session")
def templatemaasdb(pytestconfig):
-
cluster = pytestconfig.stash[cluster_stash]
force_recreate = pytestconfig.option.maas_recreate_initial_db
template_path = Path(pytestconfig.option.maas_initial_db)
@@ -179,7 +178,6 @@ def ensuremaasdb(request, templatemaasdb, pytestconfig, worker_id):
connect(cluster) as conn,
conn.cursor() as cursor,
):
-
if request.node.get_closest_marker("recreate_db"):
cursor.execute(f"DROP DATABASE IF EXISTS {dbname}")
if dbname not in cluster.databases:
diff --git a/src/maastesting/tests/test_matchers.py b/src/maastesting/tests/test_matchers.py
index 483af2a..fc20483 100644
--- a/src/maastesting/tests/test_matchers.py
+++ b/src/maastesting/tests/test_matchers.py
@@ -103,7 +103,6 @@ class TestIsCallable(MAASTestCase):
class MockTestMixin:
-
# Some matchers return a private MismatchDecorator object, which
# does not descend from Mismatch, so we check the contract instead.
is_mismatch = MatchesStructure(
diff --git a/src/maastesting/tests/test_runtest.py b/src/maastesting/tests/test_runtest.py
index 4a987d6..80a1614 100644
--- a/src/maastesting/tests/test_runtest.py
+++ b/src/maastesting/tests/test_runtest.py
@@ -11,7 +11,6 @@ class TestExecutors:
@pytest.mark.parametrize("executor", [MAASRunTest, MAASTwistedRunTest])
def test_catches_generator_tests(self, executor):
class BrokenTests(TestCase):
-
run_tests_with = executor
def test(self):
diff --git a/src/maastesting/tests/test_scenarios.py b/src/maastesting/tests/test_scenarios.py
index aad91af..96809dc 100644
--- a/src/maastesting/tests/test_scenarios.py
+++ b/src/maastesting/tests/test_scenarios.py
@@ -18,7 +18,6 @@ class TestWithScenarios(MAASTestCase):
events = []
class Test(WithScenarios, unittest.TestCase):
-
scenarios = [
("one", dict(token="one")),
("two", dict(token="two")),
@@ -39,7 +38,6 @@ class TestWithScenarios(MAASTestCase):
events = []
class Test(WithScenarios, unittest.TestCase):
-
scenarios = [
("one", dict(token="one")),
("two", dict(token="two")),
diff --git a/src/metadataserver/api.py b/src/metadataserver/api.py
index 0387813..c42a5fb 100644
--- a/src/metadataserver/api.py
+++ b/src/metadataserver/api.py
@@ -1312,7 +1312,6 @@ def get_script_result_properties(script_result):
class MAASScriptsHandler(OperationsHandler):
-
anonymous = AnonMAASScriptsHandler
def _add_script_set_to_tar(
diff --git a/src/metadataserver/api_twisted.py b/src/metadataserver/api_twisted.py
index 3b26dac..1ba61bc 100644
--- a/src/metadataserver/api_twisted.py
+++ b/src/metadataserver/api_twisted.py
@@ -45,7 +45,6 @@ log = LegacyLogger()
class StatusHandlerResource(Resource):
-
# Has no children, so getChild will not be called.
isLeaf = True
diff --git a/src/metadataserver/builtin_scripts/__init__.py b/src/metadataserver/builtin_scripts/__init__.py
index cdb4252..32e302a 100644
--- a/src/metadataserver/builtin_scripts/__init__.py
+++ b/src/metadataserver/builtin_scripts/__init__.py
@@ -33,7 +33,6 @@ from provisioningserver.refresh.node_info_scripts import (
class IBuiltinScript(Interface):
-
name = Attribute("Name")
filename = Attribute("Filename")
substitutes = Attribute("Substitutes")
@@ -43,7 +42,6 @@ class IBuiltinScript(Interface):
@implementer(IBuiltinScript)
@attr.s
class BuiltinScript:
-
name = attr.ib(default=None, validator=instance_of(str))
filename = attr.ib(default=None, validator=instance_of(str))
substitutes = attr.ib(default={}, validator=optional(instance_of(dict)))
diff --git a/src/metadataserver/builtin_scripts/commissioning_scripts/tests/test_bmc_config.py b/src/metadataserver/builtin_scripts/commissioning_scripts/tests/test_bmc_config.py
index ea4b710..9c38813 100644
--- a/src/metadataserver/builtin_scripts/commissioning_scripts/tests/test_bmc_config.py
+++ b/src/metadataserver/builtin_scripts/commissioning_scripts/tests/test_bmc_config.py
@@ -490,7 +490,6 @@ EndSection
self.assertRaises(SystemExit, self.ipmi.add_bmc_user)
def test_set_ipmi_lan_channel_setting_verifies(self):
-
for channel in [
"Lan_Channel",
"Lan_Channel_Channel_1",
diff --git a/src/metadataserver/builtin_scripts/testing_scripts/tests/test_fio.py b/src/metadataserver/builtin_scripts/testing_scripts/tests/test_fio.py
index 6589e91..31fca23 100644
--- a/src/metadataserver/builtin_scripts/testing_scripts/tests/test_fio.py
+++ b/src/metadataserver/builtin_scripts/testing_scripts/tests/test_fio.py
@@ -103,7 +103,6 @@ fio_test: (groupid=0, jobs=1): err= 0: pid=2235: Tue Jul 17 17:10:30 2018
class TestFioTestRunCmd(MAASTestCase):
-
scenarios = [
(
"old_read",
@@ -177,7 +176,6 @@ class TestFioTestRunCmd(MAASTestCase):
class TestFioTestRunFio(MAASTestCase):
-
scenarios = [
(
"old",
diff --git a/src/metadataserver/builtin_scripts/tests/test_hooks.py b/src/metadataserver/builtin_scripts/tests/test_hooks.py
index 182ed48..0b77357 100644
--- a/src/metadataserver/builtin_scripts/tests/test_hooks.py
+++ b/src/metadataserver/builtin_scripts/tests/test_hooks.py
@@ -1118,7 +1118,6 @@ def make_lldp_output(macs):
class TestDetectSwitchVendorModelDMIScenarios(MAASServerTestCase):
-
scenarios = (
(
"accton_wedge40_1",
@@ -1209,7 +1208,6 @@ TEST_MODALIASES = [
class TestFilterModaliases(MAASTestCase):
-
scenarios = (
(
"modalias_wildcard_multiple_match",
@@ -1349,7 +1347,6 @@ class TestFilterModaliases(MAASTestCase):
class TestDetectHardware(MAASServerTestCase):
-
scenarios = (
(
"caffeine_fueled_ubuntu_classic",
@@ -1518,7 +1515,6 @@ class TestAddSwitchVendorModelTags(MAASServerTestCase):
class TestCreateMetadataByModalias(MAASServerTestCase):
-
scenarios = (
(
"switch_trident2",
@@ -1568,7 +1564,6 @@ class TestCreateMetadataByModalias(MAASServerTestCase):
class TestUpdateFruidMetadata(MAASServerTestCase):
-
# This is an actual response returned by a Facebook Wedge 100.
SAMPLE_RESPONSE = b"""
{
diff --git a/src/metadataserver/enum.py b/src/metadataserver/enum.py
index 40918f3..5a5984b 100644
--- a/src/metadataserver/enum.py
+++ b/src/metadataserver/enum.py
@@ -47,7 +47,6 @@ SIGNAL_STATUS_CHOICES = (
class SCRIPT_TYPE:
-
COMMISSIONING = 0
# 1 is skipped to keep numbering the same as RESULT_TYPE
TESTING = 2
@@ -60,7 +59,6 @@ SCRIPT_TYPE_CHOICES = (
class RESULT_TYPE:
-
COMMISSIONING = 0
INSTALLATION = 1
TESTING = 2
@@ -74,7 +72,6 @@ RESULT_TYPE_CHOICES = (
class SCRIPT_STATUS:
-
PENDING = 0
RUNNING = 1
PASSED = 2
@@ -130,7 +127,6 @@ SCRIPT_STATUS_FAILED = {
class HARDWARE_TYPE:
-
NODE = 0
CPU = 1
MEMORY = 2
@@ -151,7 +147,6 @@ HARDWARE_TYPE_CHOICES = (
class SCRIPT_PARALLEL:
-
DISABLED = 0
INSTANCE = 1
ANY = 2
diff --git a/src/metadataserver/migrations/0001_initial.py b/src/metadataserver/migrations/0001_initial.py
index 078b73e..4821012 100644
--- a/src/metadataserver/migrations/0001_initial.py
+++ b/src/metadataserver/migrations/0001_initial.py
@@ -5,7 +5,6 @@ import metadataserver.fields
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0001_initial"),
("piston3", "0001_initial"),
diff --git a/src/metadataserver/migrations/0002_script_models.py b/src/metadataserver/migrations/0002_script_models.py
index e003d0d..85830b1 100644
--- a/src/metadataserver/migrations/0002_script_models.py
+++ b/src/metadataserver/migrations/0002_script_models.py
@@ -10,7 +10,6 @@ import metadataserver.fields
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0104_notifications_dismissals"),
("metadataserver", "0001_initial"),
diff --git a/src/metadataserver/migrations/0003_remove_noderesult.py b/src/metadataserver/migrations/0003_remove_noderesult.py
index 325b6f7..0e13752 100644
--- a/src/metadataserver/migrations/0003_remove_noderesult.py
+++ b/src/metadataserver/migrations/0003_remove_noderesult.py
@@ -61,7 +61,6 @@ def noderesult_to_scriptresult(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0002_script_models")]
operations = [migrations.RunPython(noderesult_to_scriptresult)]
diff --git a/src/metadataserver/migrations/0004_aborted_script_status.py b/src/metadataserver/migrations/0004_aborted_script_status.py
index 47cc019..d1d1d08 100644
--- a/src/metadataserver/migrations/0004_aborted_script_status.py
+++ b/src/metadataserver/migrations/0004_aborted_script_status.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0003_remove_noderesult")]
operations = [
diff --git a/src/metadataserver/migrations/0005_store_powerstate_on_scriptset_creation.py b/src/metadataserver/migrations/0005_store_powerstate_on_scriptset_creation.py
index 4b18efb..fc22c7b 100644
--- a/src/metadataserver/migrations/0005_store_powerstate_on_scriptset_creation.py
+++ b/src/metadataserver/migrations/0005_store_powerstate_on_scriptset_creation.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0004_aborted_script_status")]
operations = [
diff --git a/src/metadataserver/migrations/0006_scriptresult_combined_output.py b/src/metadataserver/migrations/0006_scriptresult_combined_output.py
index 12a27de..8ce91f6 100644
--- a/src/metadataserver/migrations/0006_scriptresult_combined_output.py
+++ b/src/metadataserver/migrations/0006_scriptresult_combined_output.py
@@ -4,7 +4,6 @@ import metadataserver.fields
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0005_store_powerstate_on_scriptset_creation")
]
diff --git a/src/metadataserver/migrations/0007_migrate-commissioningscripts.py b/src/metadataserver/migrations/0007_migrate-commissioningscripts.py
index 19e250d..332df22 100644
--- a/src/metadataserver/migrations/0007_migrate-commissioningscripts.py
+++ b/src/metadataserver/migrations/0007_migrate-commissioningscripts.py
@@ -29,7 +29,6 @@ def commissioningscript_to_script(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0006_scriptresult_combined_output")]
operations = [migrations.RunPython(commissioningscript_to_script)]
diff --git a/src/metadataserver/migrations/0008_remove-commissioningscripts.py b/src/metadataserver/migrations/0008_remove-commissioningscripts.py
index 005cfb6..44e7967 100644
--- a/src/metadataserver/migrations/0008_remove-commissioningscripts.py
+++ b/src/metadataserver/migrations/0008_remove-commissioningscripts.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0007_migrate-commissioningscripts")]
operations = [migrations.DeleteModel(name="CommissioningScript")]
diff --git a/src/metadataserver/migrations/0009_remove_noderesult_schema.py b/src/metadataserver/migrations/0009_remove_noderesult_schema.py
index d352a2a..c2c7899 100644
--- a/src/metadataserver/migrations/0009_remove_noderesult_schema.py
+++ b/src/metadataserver/migrations/0009_remove_noderesult_schema.py
@@ -23,7 +23,6 @@ class DeleteModel(migrations.DeleteModel):
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0008_remove-commissioningscripts")]
operations = [DeleteModel(name="NodeResult")]
diff --git a/src/metadataserver/migrations/0010_scriptresult_time_and_script_title.py b/src/metadataserver/migrations/0010_scriptresult_time_and_script_title.py
index 3c0ef95..c4c5f22 100644
--- a/src/metadataserver/migrations/0010_scriptresult_time_and_script_title.py
+++ b/src/metadataserver/migrations/0010_scriptresult_time_and_script_title.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0009_remove_noderesult_schema")]
operations = [
diff --git a/src/metadataserver/migrations/0011_script_metadata.py b/src/metadataserver/migrations/0011_script_metadata.py
index d4a2f77..223db16 100644
--- a/src/metadataserver/migrations/0011_script_metadata.py
+++ b/src/metadataserver/migrations/0011_script_metadata.py
@@ -4,7 +4,6 @@ import maasserver.migrations.fields
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0010_scriptresult_time_and_script_title")
]
diff --git a/src/metadataserver/migrations/0012_store_script_results.py b/src/metadataserver/migrations/0012_store_script_results.py
index 1ee46c7..88043e4 100644
--- a/src/metadataserver/migrations/0012_store_script_results.py
+++ b/src/metadataserver/migrations/0012_store_script_results.py
@@ -4,7 +4,6 @@ import metadataserver.fields
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0011_script_metadata")]
operations = [
diff --git a/src/metadataserver/migrations/0013_scriptresult_physicalblockdevice.py b/src/metadataserver/migrations/0013_scriptresult_physicalblockdevice.py
index 8e91472..1b94a51 100644
--- a/src/metadataserver/migrations/0013_scriptresult_physicalblockdevice.py
+++ b/src/metadataserver/migrations/0013_scriptresult_physicalblockdevice.py
@@ -2,7 +2,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0126_add_controllerinfo_model"),
("metadataserver", "0012_store_script_results"),
diff --git a/src/metadataserver/migrations/0014_rename_dhcp_unconfigured_ifaces.py b/src/metadataserver/migrations/0014_rename_dhcp_unconfigured_ifaces.py
index f93cc9c..54b3282 100644
--- a/src/metadataserver/migrations/0014_rename_dhcp_unconfigured_ifaces.py
+++ b/src/metadataserver/migrations/0014_rename_dhcp_unconfigured_ifaces.py
@@ -12,7 +12,6 @@ def rename_dhcp_unconfigured_ifaces(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0013_scriptresult_physicalblockdevice")
]
diff --git a/src/metadataserver/migrations/0015_migrate_storage_tests.py b/src/metadataserver/migrations/0015_migrate_storage_tests.py
index 50aa168..aac1c7d 100644
--- a/src/metadataserver/migrations/0015_migrate_storage_tests.py
+++ b/src/metadataserver/migrations/0015_migrate_storage_tests.py
@@ -37,7 +37,6 @@ def run_migration(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0014_rename_dhcp_unconfigured_ifaces")]
operations = [migrations.RunPython(run_migration)]
diff --git a/src/metadataserver/migrations/0016_script_model_fw_update_and_hw_config.py b/src/metadataserver/migrations/0016_script_model_fw_update_and_hw_config.py
index 55cc1e7..7072b80 100644
--- a/src/metadataserver/migrations/0016_script_model_fw_update_and_hw_config.py
+++ b/src/metadataserver/migrations/0016_script_model_fw_update_and_hw_config.py
@@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0015_migrate_storage_tests")]
operations = [
diff --git a/src/metadataserver/migrations/0017_store_requested_scripts.py b/src/metadataserver/migrations/0017_store_requested_scripts.py
index 2aa1209..e8d4458 100644
--- a/src/metadataserver/migrations/0017_store_requested_scripts.py
+++ b/src/metadataserver/migrations/0017_store_requested_scripts.py
@@ -3,7 +3,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0016_script_model_fw_update_and_hw_config")
]
diff --git a/src/metadataserver/migrations/0018_script_result_skipped.py b/src/metadataserver/migrations/0018_script_result_skipped.py
index 3c04ae2..c191fe0 100644
--- a/src/metadataserver/migrations/0018_script_result_skipped.py
+++ b/src/metadataserver/migrations/0018_script_result_skipped.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0017_store_requested_scripts")]
operations = [
diff --git a/src/metadataserver/migrations/0019_add_script_result_suppressed.py b/src/metadataserver/migrations/0019_add_script_result_suppressed.py
index 7178f77..f685d95 100644
--- a/src/metadataserver/migrations/0019_add_script_result_suppressed.py
+++ b/src/metadataserver/migrations/0019_add_script_result_suppressed.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0018_script_result_skipped")]
operations = [
diff --git a/src/metadataserver/migrations/0020_network_testing.py b/src/metadataserver/migrations/0020_network_testing.py
index 225fcaf..12d4ad1 100644
--- a/src/metadataserver/migrations/0020_network_testing.py
+++ b/src/metadataserver/migrations/0020_network_testing.py
@@ -5,7 +5,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
-
dependencies = [
("maasserver", "0188_network_testing"),
("metadataserver", "0019_add_script_result_suppressed"),
diff --git a/src/metadataserver/migrations/0021_scriptresult_applying_netconf.py b/src/metadataserver/migrations/0021_scriptresult_applying_netconf.py
index 72dcef1..4094a85 100644
--- a/src/metadataserver/migrations/0021_scriptresult_applying_netconf.py
+++ b/src/metadataserver/migrations/0021_scriptresult_applying_netconf.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0020_network_testing")]
operations = [
diff --git a/src/metadataserver/migrations/0022_internet-connectivity-network-validation.py b/src/metadataserver/migrations/0022_internet-connectivity-network-validation.py
index bbe0d32..c47a466 100644
--- a/src/metadataserver/migrations/0022_internet-connectivity-network-validation.py
+++ b/src/metadataserver/migrations/0022_internet-connectivity-network-validation.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0021_scriptresult_applying_netconf")]
operations = [
diff --git a/src/metadataserver/migrations/0023_reorder_network_scripts.py b/src/metadataserver/migrations/0023_reorder_network_scripts.py
index 693ad21..69af88e 100644
--- a/src/metadataserver/migrations/0023_reorder_network_scripts.py
+++ b/src/metadataserver/migrations/0023_reorder_network_scripts.py
@@ -20,7 +20,6 @@ def reorder_network_scripts(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0022_internet-connectivity-network-validation")
]
diff --git a/src/metadataserver/migrations/0024_reorder_commissioning_scripts.py b/src/metadataserver/migrations/0024_reorder_commissioning_scripts.py
index 164d3ff..6d279dd 100644
--- a/src/metadataserver/migrations/0024_reorder_commissioning_scripts.py
+++ b/src/metadataserver/migrations/0024_reorder_commissioning_scripts.py
@@ -24,7 +24,6 @@ def reorder_commissioning_scripts(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0023_reorder_network_scripts")]
operations = [migrations.RunPython(reorder_commissioning_scripts)]
diff --git a/src/metadataserver/migrations/0025_nodedevice.py b/src/metadataserver/migrations/0025_nodedevice.py
index c859975..4c6f36b 100644
--- a/src/metadataserver/migrations/0025_nodedevice.py
+++ b/src/metadataserver/migrations/0025_nodedevice.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0024_reorder_commissioning_scripts"),
]
diff --git a/src/metadataserver/migrations/0026_drop_ipaddr_script.py b/src/metadataserver/migrations/0026_drop_ipaddr_script.py
index cf69a08..6b14c3d 100644
--- a/src/metadataserver/migrations/0026_drop_ipaddr_script.py
+++ b/src/metadataserver/migrations/0026_drop_ipaddr_script.py
@@ -7,7 +7,6 @@ def drop_ipaddr_scripts(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0025_nodedevice"),
]
diff --git a/src/metadataserver/migrations/0027_reorder_machine_resources_script.py b/src/metadataserver/migrations/0027_reorder_machine_resources_script.py
index 35ff28e..2ac024e 100644
--- a/src/metadataserver/migrations/0027_reorder_machine_resources_script.py
+++ b/src/metadataserver/migrations/0027_reorder_machine_resources_script.py
@@ -10,7 +10,6 @@ def reorder_machine_resources_script(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [("metadataserver", "0026_drop_ipaddr_script")]
operations = [migrations.RunPython(reorder_machine_resources_script)]
diff --git a/src/metadataserver/migrations/0028_scriptset_requested_scripts_rename.py b/src/metadataserver/migrations/0028_scriptset_requested_scripts_rename.py
index a07e9ca..0dd1dad 100644
--- a/src/metadataserver/migrations/0028_scriptset_requested_scripts_rename.py
+++ b/src/metadataserver/migrations/0028_scriptset_requested_scripts_rename.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0027_reorder_machine_resources_script"),
]
diff --git a/src/metadataserver/migrations/0029_scriptset_tags_cleanup.py b/src/metadataserver/migrations/0029_scriptset_tags_cleanup.py
index 51129f3..d53001f 100644
--- a/src/metadataserver/migrations/0029_scriptset_tags_cleanup.py
+++ b/src/metadataserver/migrations/0029_scriptset_tags_cleanup.py
@@ -6,7 +6,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0028_scriptset_requested_scripts_rename"),
]
diff --git a/src/metadataserver/migrations/0030_scriptresult_script_link.py b/src/metadataserver/migrations/0030_scriptresult_script_link.py
index a2827da..4727859 100644
--- a/src/metadataserver/migrations/0030_scriptresult_script_link.py
+++ b/src/metadataserver/migrations/0030_scriptresult_script_link.py
@@ -55,7 +55,6 @@ def add_run_machine_resources_scriptresult(apps, schema_editor):
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0029_scriptset_tags_cleanup"),
]
diff --git a/src/metadataserver/migrations/0031_id_field_bigint.py b/src/metadataserver/migrations/0031_id_field_bigint.py
index 7335185..9348978 100644
--- a/src/metadataserver/migrations/0031_id_field_bigint.py
+++ b/src/metadataserver/migrations/0031_id_field_bigint.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0030_scriptresult_script_link"),
]
diff --git a/src/metadataserver/migrations/0032_default_auto_field.py b/src/metadataserver/migrations/0032_default_auto_field.py
index 99e5339..f703b3f 100644
--- a/src/metadataserver/migrations/0032_default_auto_field.py
+++ b/src/metadataserver/migrations/0032_default_auto_field.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0031_id_field_bigint"),
]
diff --git a/src/metadataserver/migrations/0033_remove_nodekey_key.py b/src/metadataserver/migrations/0033_remove_nodekey_key.py
index 32f158b..79d9364 100644
--- a/src/metadataserver/migrations/0033_remove_nodekey_key.py
+++ b/src/metadataserver/migrations/0033_remove_nodekey_key.py
@@ -4,7 +4,6 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0032_default_auto_field"),
]
diff --git a/src/metadataserver/migrations/0034_use_builtin_json_field.py b/src/metadataserver/migrations/0034_use_builtin_json_field.py
index a8c51d6..27ce89a 100644
--- a/src/metadataserver/migrations/0034_use_builtin_json_field.py
+++ b/src/metadataserver/migrations/0034_use_builtin_json_field.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
("metadataserver", "0033_remove_nodekey_key"),
]
diff --git a/src/metadataserver/models/script.py b/src/metadataserver/models/script.py
index 97efa51..da649b0 100644
--- a/src/metadataserver/models/script.py
+++ b/src/metadataserver/models/script.py
@@ -132,7 +132,6 @@ class ScriptManager(Manager):
class Script(CleanSave, TimestampedModel):
-
objects = ScriptManager()
name = CharField(max_length=255, unique=True)
diff --git a/src/metadataserver/models/scriptresult.py b/src/metadataserver/models/scriptresult.py
index 832c355..5b1ffa3 100644
--- a/src/metadataserver/models/scriptresult.py
+++ b/src/metadataserver/models/scriptresult.py
@@ -40,7 +40,6 @@ from provisioningserver.events import EVENT_TYPES
class ScriptResult(CleanSave, TimestampedModel):
-
script_set = ForeignKey(ScriptSet, editable=False, on_delete=CASCADE)
# All ScriptResults except commissioning scripts will be linked to a Script
diff --git a/src/metadataserver/models/scriptset.py b/src/metadataserver/models/scriptset.py
index 5214adf..590f1f8 100644
--- a/src/metadataserver/models/scriptset.py
+++ b/src/metadataserver/models/scriptset.py
@@ -366,7 +366,6 @@ class ScriptSetManager(Manager):
class ScriptSet(CleanSave, Model):
-
objects = ScriptSetManager()
last_ping = DateTimeField(blank=True, null=True)
diff --git a/src/metadataserver/user_data/tests/test_generate_user_data.py b/src/metadataserver/user_data/tests/test_generate_user_data.py
index 79450f8..365bda2 100644
--- a/src/metadataserver/user_data/tests/test_generate_user_data.py
+++ b/src/metadataserver/user_data/tests/test_generate_user_data.py
@@ -178,7 +178,6 @@ class TestGenerateUserData(MAASServerTestCase):
class TestDiskErasingUserData(MAASServerTestCase):
-
scenarios = (
(
"secure_and_quick",
diff --git a/src/provisioningserver/boot/grub.py b/src/provisioningserver/boot/grub.py
index 48a6509..515fa9c 100644
--- a/src/provisioningserver/boot/grub.py
+++ b/src/provisioningserver/boot/grub.py
@@ -66,7 +66,6 @@ re_config_file = re.compile(re_config_file, re.VERBOSE)
class UEFIAMD64BootMethod(BootMethod):
-
name = "uefi_amd64_tftp"
bios_boot_method = "uefi"
template_subdir = "uefi"
@@ -203,7 +202,6 @@ class UEFIAMD64BootMethod(BootMethod):
class UEFIAMD64HTTPBootMethod(UEFIAMD64BootMethod):
-
name = "uefi_amd64_http"
arch_octet = "00:10"
absolute_url_as_filename = True
@@ -215,14 +213,12 @@ class UEFIAMD64HTTPBootMethod(UEFIAMD64BootMethod):
# To fix LP:1768034 MAAS was modified to respond to 00:09 with AMD64 GRUB. This
# is incorrect but did fix the bug.
class UEFIEBCBootMethod(UEFIAMD64BootMethod):
-
name = "uefi_ebc_tftp"
bootloader_arches = ["ebc"]
arch_octet = "00:09"
class UEFIARM64BootMethod(UEFIAMD64BootMethod):
-
name = "uefi_arm64_tftp"
bootloader_arches = ["arm64"]
bootloader_path = "bootaa64.efi"
@@ -231,7 +227,6 @@ class UEFIARM64BootMethod(UEFIAMD64BootMethod):
class UEFIARM64HTTPBootMethod(UEFIARM64BootMethod):
-
name = "uefi_arm64_http"
arch_octet = "00:13"
absolute_url_as_filename = True
@@ -239,7 +234,6 @@ class UEFIARM64HTTPBootMethod(UEFIARM64BootMethod):
class OpenFirmwarePPC64ELBootMethod(UEFIAMD64BootMethod):
-
# Architecture is included in the name as open firmware can be used on
# multiple architectures.
name = "open-firmware_ppc64el"
diff --git a/src/provisioningserver/boot/powernv.py b/src/provisioningserver/boot/powernv.py
index 2cc5ba2..5c78298 100644
--- a/src/provisioningserver/boot/powernv.py
+++ b/src/provisioningserver/boot/powernv.py
@@ -68,7 +68,6 @@ def format_bootif(mac):
class PowerNVBootMethod(BootMethod):
-
name = "powernv"
bios_boot_method = "powernv"
template_subdir = "pxe"
diff --git a/src/provisioningserver/boot/pxe.py b/src/provisioningserver/boot/pxe.py
index acadc4c..2e9a69b 100644
--- a/src/provisioningserver/boot/pxe.py
+++ b/src/provisioningserver/boot/pxe.py
@@ -69,7 +69,6 @@ re_config_file = re.compile(re_config_file, re.VERBOSE)
class PXEBootMethod(BootMethod):
-
name = "pxe"
bios_boot_method = "pxe"
template_subdir = "pxe"
diff --git a/src/provisioningserver/boot/s390x.py b/src/provisioningserver/boot/s390x.py
index 5ccd3a0..301a7d7 100644
--- a/src/provisioningserver/boot/s390x.py
+++ b/src/provisioningserver/boot/s390x.py
@@ -67,7 +67,6 @@ def format_bootif(mac):
class S390XBootMethod(BootMethod):
-
name = "s390x"
bios_boot_method = "s390x"
template_subdir = "pxe"
diff --git a/src/provisioningserver/boot/s390x_partition.py b/src/provisioningserver/boot/s390x_partition.py
index f1f01de..d9787fc 100644
--- a/src/provisioningserver/boot/s390x_partition.py
+++ b/src/provisioningserver/boot/s390x_partition.py
@@ -11,7 +11,6 @@ from provisioningserver.kernel_opts import compose_kernel_command_line
class S390XPartitionBootMethod(BootMethod):
-
name = "s390x_partition"
bios_boot_method = "s390x_partition"
template_subdir = "s390x_partition"
diff --git a/src/provisioningserver/boot/tests/test_boot.py b/src/provisioningserver/boot/tests/test_boot.py
index 7a95038..b7d7173 100644
--- a/src/provisioningserver/boot/tests/test_boot.py
+++ b/src/provisioningserver/boot/tests/test_boot.py
@@ -40,7 +40,6 @@ TIMEOUT = get_testing_timeout()
class FakeBootMethod(BootMethod):
-
name = factory.make_name("name")
bios_boot_method = factory.make_name("bios_boot_method")
template_subdir = factory.make_name("template_subdir")
@@ -374,7 +373,6 @@ class TestBootMethod(MAASTestCase):
class TestGetArchiveUrl(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
diff --git a/src/provisioningserver/boot/tests/test_windows.py b/src/provisioningserver/boot/tests/test_windows.py
index f939992..9c4d967 100644
--- a/src/provisioningserver/boot/tests/test_windows.py
+++ b/src/provisioningserver/boot/tests/test_windows.py
@@ -145,7 +145,6 @@ class TestBcd(MAASTestCase):
class TestRequestNodeInfoByMACAddress(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_returns_None_when_MAC_is_None(self):
@@ -173,7 +172,6 @@ class TestRequestNodeInfoByMACAddress(MAASTestCase):
class TestWindowsPXEBootMethod(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
diff --git a/src/provisioningserver/boot/windows.py b/src/provisioningserver/boot/windows.py
index 840ef5c..f92915b 100644
--- a/src/provisioningserver/boot/windows.py
+++ b/src/provisioningserver/boot/windows.py
@@ -180,7 +180,6 @@ class Bcd:
class WindowsPXEBootMethod(BootMethod):
-
name = "windows"
bios_boot_method = "pxe"
template_subdir = "windows"
diff --git a/src/provisioningserver/dhcp/tests/test_detect.py b/src/provisioningserver/dhcp/tests/test_detect.py
index 93b5954..9e27f49 100644
--- a/src/provisioningserver/dhcp/tests/test_detect.py
+++ b/src/provisioningserver/dhcp/tests/test_detect.py
@@ -233,7 +233,6 @@ def make_Failure(exception_type, *args, **kwargs):
class TestDHCPRequestMonitor(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(debug=False, timeout=5)
def test_send_requests_and_await_replies(self):
diff --git a/src/provisioningserver/dhcp/tests/test_helper_notify.py b/src/provisioningserver/dhcp/tests/test_helper_notify.py
index 88316b1..70a4904 100644
--- a/src/provisioningserver/dhcp/tests/test_helper_notify.py
+++ b/src/provisioningserver/dhcp/tests/test_helper_notify.py
@@ -24,7 +24,6 @@ TIMEOUT = get_testing_timeout()
class TestDHCPNotify(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def patch_socket_path(self):
diff --git a/src/provisioningserver/dns/tests/test_zoneconfig.py b/src/provisioningserver/dns/tests/test_zoneconfig.py
index e9f6dc1..da7557d 100644
--- a/src/provisioningserver/dns/tests/test_zoneconfig.py
+++ b/src/provisioningserver/dns/tests/test_zoneconfig.py
@@ -759,7 +759,7 @@ class TestDNSReverseZoneConfig(MAASTestCase):
nets = t_case[0]
expected = t_case[1]
domain = factory.make_name("zone")
- for (idx, net) in enumerate(nets):
+ for idx, net in enumerate(nets):
network = net[0]
other_subnets = net[1]
dns_zone_config = DNSReverseZoneConfig(
diff --git a/src/provisioningserver/dns/zoneconfig.py b/src/provisioningserver/dns/zoneconfig.py
index 2992337..84a8c28 100644
--- a/src/provisioningserver/dns/zoneconfig.py
+++ b/src/provisioningserver/dns/zoneconfig.py
@@ -479,7 +479,6 @@ class DNSReverseZoneConfig(DomainConfigBase):
zone_rest = ".".join(split_zone[rest_limit:-1])
base = int(split_zone[rest_limit - 1])
while first <= last:
-
(first, base) = cls._skip_if_overlaps(
first, base, step, network, exclude
)
diff --git a/src/provisioningserver/drivers/hardware/seamicro.py b/src/provisioningserver/drivers/hardware/seamicro.py
index 5c21925..e213907 100644
--- a/src/provisioningserver/drivers/hardware/seamicro.py
+++ b/src/provisioningserver/drivers/hardware/seamicro.py
@@ -40,7 +40,6 @@ class SeaMicroAPIV09Error(SeaMicroError):
class SeaMicroAPIV09:
-
allowed_codes = [
http.client.OK,
http.client.ACCEPTED,
diff --git a/src/provisioningserver/drivers/hardware/tests/test_ucsm.py b/src/provisioningserver/drivers/hardware/tests/test_ucsm.py
index e52ead5..ebac33b 100644
--- a/src/provisioningserver/drivers/hardware/tests/test_ucsm.py
+++ b/src/provisioningserver/drivers/hardware/tests/test_ucsm.py
@@ -550,7 +550,6 @@ class TestUCSMPowerState(MAASTestCase):
class TestProbeAndEnlistUCSM(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
@@ -631,7 +630,6 @@ def make_boot_order_scenarios(size):
class TestGetFirstBooter(MAASTestCase):
-
scenarios, minimum = make_boot_order_scenarios(3)
def test_first_booter(self):
diff --git a/src/provisioningserver/drivers/hardware/tests/test_vmware.py b/src/provisioningserver/drivers/hardware/tests/test_vmware.py
index 579794f..433b452 100644
--- a/src/provisioningserver/drivers/hardware/tests/test_vmware.py
+++ b/src/provisioningserver/drivers/hardware/tests/test_vmware.py
@@ -93,7 +93,6 @@ class FakeVmomiVM:
def __init__(
self, name=None, nics=None, has_instance_uuid=None, has_uuid=None
):
-
if name is None:
self._name = factory.make_hostname()
else:
diff --git a/src/provisioningserver/drivers/hardware/virsh.py b/src/provisioningserver/drivers/hardware/virsh.py
index f3f2711..e8e753b 100644
--- a/src/provisioningserver/drivers/hardware/virsh.py
+++ b/src/provisioningserver/drivers/hardware/virsh.py
@@ -57,7 +57,6 @@ class VirshError(Exception):
class VirshSSH(pexpect.spawn):
-
PROMPT = r"virsh \#"
PROMPT_SSHKEY = "(?i)are you sure you want to continue connecting"
PROMPT_PASSWORD = "(?i)(?:password)|(?:passphrase for key)"
diff --git a/src/provisioningserver/drivers/hardware/vmware.py b/src/provisioningserver/drivers/hardware/vmware.py
index f365696..42605a4 100644
--- a/src/provisioningserver/drivers/hardware/vmware.py
+++ b/src/provisioningserver/drivers/hardware/vmware.py
@@ -415,7 +415,6 @@ def probe_vmware_and_enlist(
accept_all: bool = False,
domain: str = None,
):
-
# Both '' and None mean the same thing, so normalize it.
if prefix_filter is None:
prefix_filter = ""
diff --git a/src/provisioningserver/drivers/osystem/bootloader.py b/src/provisioningserver/drivers/osystem/bootloader.py
index aba6e72..8be50bc 100644
--- a/src/provisioningserver/drivers/osystem/bootloader.py
+++ b/src/provisioningserver/drivers/osystem/bootloader.py
@@ -11,7 +11,6 @@ from provisioningserver.drivers.osystem import (
class BootLoaderOS(OperatingSystem):
-
name = "bootloader"
title = "Bootloader"
diff --git a/src/provisioningserver/drivers/osystem/tests/test_base.py b/src/provisioningserver/drivers/osystem/tests/test_base.py
index 851b714..cff5fdb 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_base.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_base.py
@@ -97,7 +97,6 @@ class TestOperatingSystem(MAASTestCase):
class TestFindImage(MAASTestCase):
-
scenarios = [
(
"squashfs",
diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
index 0181eaf..9640c10 100644
--- a/src/provisioningserver/drivers/pod/lxd.py
+++ b/src/provisioningserver/drivers/pod/lxd.py
@@ -183,7 +183,6 @@ class LXDPodError(Exception):
class LXDPodDriver(PodDriver):
-
name = "lxd"
chassis = True
can_probe = False
diff --git a/src/provisioningserver/drivers/pod/tests/test_base.py b/src/provisioningserver/drivers/pod/tests/test_base.py
index 1d48f46..b970929 100644
--- a/src/provisioningserver/drivers/pod/tests/test_base.py
+++ b/src/provisioningserver/drivers/pod/tests/test_base.py
@@ -294,7 +294,6 @@ class TestRequestClasses(MAASTestCase):
class FakePodDriverBase(PodDriverBase):
-
name = ""
chassis = True
can_probe = True
@@ -530,7 +529,6 @@ class TestPodDriverBase(MAASTestCase):
class TestGetErrorMessage(MAASTestCase):
-
scenarios = [
(
"auth",
diff --git a/src/provisioningserver/drivers/pod/tests/test_lxd.py b/src/provisioningserver/drivers/pod/tests/test_lxd.py
index 4b0c6fc..2a69eea 100644
--- a/src/provisioningserver/drivers/pod/tests/test_lxd.py
+++ b/src/provisioningserver/drivers/pod/tests/test_lxd.py
@@ -296,7 +296,6 @@ def _make_context(
class TestClusteredLXDPodDriver(MAASTestCase):
-
run_tests_with = twisted_test_factory
def setUp(self):
@@ -399,7 +398,6 @@ class TestClusteredLXDPodDriver(MAASTestCase):
class TestLXDPodDriver(MAASTestCase):
-
run_tests_with = twisted_test_factory
def setUp(self):
diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
index 629f277..de293bd 100644
--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
@@ -2565,7 +2565,6 @@ class TestVirsh(MAASTestCase):
class TestVirshPodDriver(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_missing_packages(self):
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index c490cbc..6a89b08 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -284,7 +284,6 @@ class VirshError(Exception):
class VirshSSH(pexpect.spawn):
-
PROMPT = r"virsh \#"
PROMPT_SSHKEY = "(?i)are you sure you want to continue connecting"
PROMPT_PASSWORD = "(?i)(?:password)|(?:passphrase for key)"
@@ -1273,7 +1272,6 @@ class VirshSSH(pexpect.spawn):
class VirshPodDriver(PodDriver):
-
name = "virsh"
description = "Virsh (virtual systems)"
can_probe = True
diff --git a/src/provisioningserver/drivers/power/amt.py b/src/provisioningserver/drivers/power/amt.py
index cddebdd..63ecb29 100644
--- a/src/provisioningserver/drivers/power/amt.py
+++ b/src/provisioningserver/drivers/power/amt.py
@@ -43,7 +43,6 @@ REQUIRED_PACKAGES = [["wsman", "wsmancli"]]
class AMTPowerDriver(PowerDriver):
-
name = "amt"
chassis = False
can_probe = False
diff --git a/src/provisioningserver/drivers/power/apc.py b/src/provisioningserver/drivers/power/apc.py
index 161d41c..a6c1bd5 100644
--- a/src/provisioningserver/drivers/power/apc.py
+++ b/src/provisioningserver/drivers/power/apc.py
@@ -42,7 +42,6 @@ APC_PDU_TYPE_OUTLET_SUFFIX = {
class APCPowerDriver(PowerDriver):
-
name = "apc"
chassis = True
can_probe = False
diff --git a/src/provisioningserver/drivers/power/eaton.py b/src/provisioningserver/drivers/power/eaton.py
index 92b3879..b2bb999 100644
--- a/src/provisioningserver/drivers/power/eaton.py
+++ b/src/provisioningserver/drivers/power/eaton.py
@@ -28,7 +28,6 @@ class EatonFunction:
class EatonPowerDriver(PowerDriver):
-
name = "eaton"
chassis = True
can_probe = False
diff --git a/src/provisioningserver/drivers/power/hmc.py b/src/provisioningserver/drivers/power/hmc.py
index f397f19..1525daf 100644
--- a/src/provisioningserver/drivers/power/hmc.py
+++ b/src/provisioningserver/drivers/power/hmc.py
@@ -31,7 +31,6 @@ class HMCState:
class HMCPowerDriver(PowerDriver):
-
name = "hmc"
chassis = True
can_probe = False
diff --git a/src/provisioningserver/drivers/power/hmcz.py b/src/provisioningserver/drivers/power/hmcz.py
index f5072eb..d4f8e5e 100644
--- a/src/provisioningserver/drivers/power/hmcz.py
+++ b/src/provisioningserver/drivers/power/hmcz.py
@@ -38,7 +38,6 @@ maaslog = get_maas_logger("drivers.power.hmcz")
class HMCZPowerDriver(PowerDriver):
-
name = "hmcz"
chassis = True
can_probe = True
diff --git a/src/provisioningserver/drivers/power/ipmi.py b/src/provisioningserver/drivers/power/ipmi.py
index 09f3295..f3f0806 100644
--- a/src/provisioningserver/drivers/power/ipmi.py
+++ b/src/provisioningserver/drivers/power/ipmi.py
@@ -236,7 +236,6 @@ IPMI_WORKAROUND_FLAG_CHOICES = [
@enum.unique
class IPMI_PRIVILEGE_LEVEL(enum.Enum):
-
USER = "USER"
OPERATOR = "OPERATOR"
ADMIN = "ADMIN"
@@ -250,7 +249,6 @@ IPMI_PRIVILEGE_LEVEL_CHOICES = [
class IPMIPowerDriver(PowerDriver):
-
name = "ipmi"
chassis = False
can_probe = False
diff --git a/src/provisioningserver/drivers/power/manual.py b/src/provisioningserver/drivers/power/manual.py
index 49547d3..0237c97 100644
--- a/src/provisioningserver/drivers/power/manual.py
+++ b/src/provisioningserver/drivers/power/manual.py
@@ -13,7 +13,6 @@ maaslog = get_maas_logger("drivers.power.manual")
class ManualPowerDriver(PowerDriver):
-
name = "manual"
chassis = False
can_probe = False
diff --git a/src/provisioningserver/drivers/power/moonshot.py b/src/provisioningserver/drivers/power/moonshot.py
index 44e45e3..83bd2ca 100644
--- a/src/provisioningserver/drivers/power/moonshot.py
+++ b/src/provisioningserver/drivers/power/moonshot.py
@@ -21,7 +21,6 @@ from provisioningserver.utils.shell import (
class MoonshotIPMIPowerDriver(PowerDriver):
-
name = "moonshot"
chassis = True
can_probe = False
diff --git a/src/provisioningserver/drivers/power/mscm.py b/src/provisioningserver/drivers/power/mscm.py
index 5669c6b..7d36293 100644
--- a/src/provisioningserver/drivers/power/mscm.py
+++ b/src/provisioningserver/drivers/power/mscm.py
@@ -52,7 +52,6 @@ class MSCMState:
class MSCMPowerDriver(PowerDriver):
-
name = "mscm"
chassis = True
can_probe = True
diff --git a/src/provisioningserver/drivers/power/msftocs.py b/src/provisioningserver/drivers/power/msftocs.py
index 8313f45..b816101 100644
--- a/src/provisioningserver/drivers/power/msftocs.py
+++ b/src/provisioningserver/drivers/power/msftocs.py
@@ -32,7 +32,6 @@ class MicrosoftOCSState:
class MicrosoftOCSPowerDriver(PowerDriver):
-
name = "msftocs"
chassis = True
can_probe = True
diff --git a/src/provisioningserver/drivers/power/nova.py b/src/provisioningserver/drivers/power/nova.py
index fc9d7b1..0391953 100644
--- a/src/provisioningserver/drivers/power/nova.py
+++ b/src/provisioningserver/drivers/power/nova.py
@@ -35,7 +35,6 @@ class NovaPowerState:
class NovaPowerDriver(PowerDriver):
-
name = "nova"
chassis = True
can_probe = False
diff --git a/src/provisioningserver/drivers/power/openbmc.py b/src/provisioningserver/drivers/power/openbmc.py
index 2ffe406..e622ddd 100644
--- a/src/provisioningserver/drivers/power/openbmc.py
+++ b/src/provisioningserver/drivers/power/openbmc.py
@@ -36,7 +36,6 @@ REG_MODE = {"data": "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular"}
class OpenBMCPowerDriver(PowerDriver):
-
chassis = False
can_probe = False
can_set_boot_order = False
diff --git a/src/provisioningserver/drivers/power/proxmox.py b/src/provisioningserver/drivers/power/proxmox.py
index a7b5635..659077f 100644
--- a/src/provisioningserver/drivers/power/proxmox.py
+++ b/src/provisioningserver/drivers/power/proxmox.py
@@ -29,7 +29,6 @@ from provisioningserver.utils.twisted import asynchronous
class ProxmoxPowerDriver(WebhookPowerDriver):
-
name = "proxmox"
chassis = True
can_probe = True
diff --git a/src/provisioningserver/drivers/power/raritan.py b/src/provisioningserver/drivers/power/raritan.py
index 5deda9e..9a8caf1 100644
--- a/src/provisioningserver/drivers/power/raritan.py
+++ b/src/provisioningserver/drivers/power/raritan.py
@@ -25,7 +25,6 @@ class RaritanState:
class RaritanPowerDriver(PowerDriver):
-
name = "raritan"
chassis = True
can_probe = False
diff --git a/src/provisioningserver/drivers/power/recs.py b/src/provisioningserver/drivers/power/recs.py
index ffddcbc..cf80890 100644
--- a/src/provisioningserver/drivers/power/recs.py
+++ b/src/provisioningserver/drivers/power/recs.py
@@ -201,7 +201,6 @@ class RECSAPI:
class RECSPowerDriver(PowerDriver):
-
name = "recs_box"
chassis = True
can_probe = True
diff --git a/src/provisioningserver/drivers/power/redfish.py b/src/provisioningserver/drivers/power/redfish.py
index f554a22..2be490e 100644
--- a/src/provisioningserver/drivers/power/redfish.py
+++ b/src/provisioningserver/drivers/power/redfish.py
@@ -151,7 +151,6 @@ class RedfishPowerDriverBase(PowerDriver):
# XXX ltrager - 2021-01-12 - Change parent class to WebhookPowerDriver.
class RedfishPowerDriver(RedfishPowerDriverBase):
-
chassis = True # Redfish API endpoints can be probed and enlisted.
can_probe = False
can_set_boot_order = False
diff --git a/src/provisioningserver/drivers/power/seamicro.py b/src/provisioningserver/drivers/power/seamicro.py
index aa44929..6e77979 100644
--- a/src/provisioningserver/drivers/power/seamicro.py
+++ b/src/provisioningserver/drivers/power/seamicro.py
@@ -36,7 +36,6 @@ def extract_seamicro_parameters(context):
class SeaMicroPowerDriver(PowerDriver):
-
name = "sm15k"
chassis = True
can_probe = True
diff --git a/src/provisioningserver/drivers/power/tests/test_base.py b/src/provisioningserver/drivers/power/tests/test_base.py
index b79e210..cb3423d 100644
--- a/src/provisioningserver/drivers/power/tests/test_base.py
+++ b/src/provisioningserver/drivers/power/tests/test_base.py
@@ -42,7 +42,6 @@ TIMEOUT = get_testing_timeout()
class FakePowerDriverBase(PowerDriverBase):
-
name = ""
chassis = False
can_probe = False
@@ -212,7 +211,6 @@ class TestPowerDriverBase(MAASTestCase):
class TestGetErrorMessage(MAASTestCase):
-
scenarios = [
(
"auth",
@@ -263,7 +261,6 @@ class TestGetErrorMessage(MAASTestCase):
class FakePowerDriver(PowerDriver):
-
name = ""
chassis = False
can_probe = False
@@ -367,7 +364,6 @@ def make_async_power_driver(
class TestPowerDriverPowerAction(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
scenarios = [
@@ -485,7 +481,6 @@ class TestPowerDriverPowerAction(MAASTestCase):
class TestPowerDriverCycle(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
@@ -519,7 +514,6 @@ class TestPowerDriverCycle(MAASTestCase):
class TestPowerDriverQuery(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
diff --git a/src/provisioningserver/drivers/power/tests/test_hmcz.py b/src/provisioningserver/drivers/power/tests/test_hmcz.py
index 29a1af7..201bf5e 100644
--- a/src/provisioningserver/drivers/power/tests/test_hmcz.py
+++ b/src/provisioningserver/drivers/power/tests/test_hmcz.py
@@ -31,7 +31,6 @@ TIMEOUT = get_testing_timeout()
class TestHMCZPowerDriver(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -516,7 +515,6 @@ class TestHMCZPowerDriver(MAASTestCase):
@dataclass
class FakeNode:
-
architecture: str
power_type: str
power_parameters: dict
@@ -579,7 +577,6 @@ class FakeRPCService:
class TestProbeHMCZAndEnlist(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
diff --git a/src/provisioningserver/drivers/power/tests/test_mscm.py b/src/provisioningserver/drivers/power/tests/test_mscm.py
index 65fe9c3..b241a96 100644
--- a/src/provisioningserver/drivers/power/tests/test_mscm.py
+++ b/src/provisioningserver/drivers/power/tests/test_mscm.py
@@ -295,7 +295,6 @@ class TestMSCMPowerDriver(MAASTestCase):
class TestMSCMProbeAndEnlist(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
@@ -400,7 +399,6 @@ class TestMSCMProbeAndEnlist(MAASTestCase):
class TestMSCMProbeAndEnlistCrashesNoMatch(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
diff --git a/src/provisioningserver/drivers/power/tests/test_openbmc.py b/src/provisioningserver/drivers/power/tests/test_openbmc.py
index 30ee10f..87cbe64 100644
--- a/src/provisioningserver/drivers/power/tests/test_openbmc.py
+++ b/src/provisioningserver/drivers/power/tests/test_openbmc.py
@@ -51,7 +51,6 @@ class TestWebClientContextFactory(MAASTestCase):
class TestOpenBMCPowerDriver(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/drivers/power/tests/test_proxmox.py b/src/provisioningserver/drivers/power/tests/test_proxmox.py
index 154017b..e892edc 100644
--- a/src/provisioningserver/drivers/power/tests/test_proxmox.py
+++ b/src/provisioningserver/drivers/power/tests/test_proxmox.py
@@ -26,7 +26,6 @@ TIMEOUT = get_testing_timeout()
class TestProxmoxPowerDriver(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -465,7 +464,6 @@ class TestProxmoxPowerDriver(MAASTestCase):
class TestProxmoxProbeAndEnlist(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
diff --git a/src/provisioningserver/drivers/power/tests/test_redfish.py b/src/provisioningserver/drivers/power/tests/test_redfish.py
index 02549ba..22dcb14 100644
--- a/src/provisioningserver/drivers/power/tests/test_redfish.py
+++ b/src/provisioningserver/drivers/power/tests/test_redfish.py
@@ -164,7 +164,6 @@ class TestWebClientContextFactory(MAASTestCase):
class TestRedfishPowerDriver(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/drivers/power/tests/test_webhook.py b/src/provisioningserver/drivers/power/tests/test_webhook.py
index a7ed4fb..7700ae2 100644
--- a/src/provisioningserver/drivers/power/tests/test_webhook.py
+++ b/src/provisioningserver/drivers/power/tests/test_webhook.py
@@ -26,7 +26,6 @@ from provisioningserver.utils.version import get_running_version
class TestWebhookPowerDriver(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/drivers/power/ucsm.py b/src/provisioningserver/drivers/power/ucsm.py
index 43c4b5c..0431354 100644
--- a/src/provisioningserver/drivers/power/ucsm.py
+++ b/src/provisioningserver/drivers/power/ucsm.py
@@ -26,7 +26,6 @@ def extract_ucsm_parameters(context):
class UCSMPowerDriver(PowerDriver):
-
name = "ucsm"
chassis = True
can_probe = True
diff --git a/src/provisioningserver/drivers/power/vmware.py b/src/provisioningserver/drivers/power/vmware.py
index 21929a0..551f637 100644
--- a/src/provisioningserver/drivers/power/vmware.py
+++ b/src/provisioningserver/drivers/power/vmware.py
@@ -34,7 +34,6 @@ def extract_vmware_parameters(context):
class VMwarePowerDriver(PowerDriver):
-
name = "vmware"
chassis = True
can_probe = True
diff --git a/src/provisioningserver/drivers/power/webhook.py b/src/provisioningserver/drivers/power/webhook.py
index ac61510..0069980 100644
--- a/src/provisioningserver/drivers/power/webhook.py
+++ b/src/provisioningserver/drivers/power/webhook.py
@@ -34,7 +34,6 @@ SSL_INSECURE_CHOICES = [[SSL_INSECURE_NO, "No"], [SSL_INSECURE_YES, "Yes"]]
class WebhookPowerDriver(PowerDriver):
-
name = "webhook"
chassis = False
can_probe = False
diff --git a/src/provisioningserver/drivers/power/wedge.py b/src/provisioningserver/drivers/power/wedge.py
index 9f723fb..85a6880 100644
--- a/src/provisioningserver/drivers/power/wedge.py
+++ b/src/provisioningserver/drivers/power/wedge.py
@@ -23,7 +23,6 @@ class WedgeState:
class WedgePowerDriver(PowerDriver):
-
name = "wedge"
chassis = False
can_probe = False
diff --git a/src/provisioningserver/drivers/tests/test_base.py b/src/provisioningserver/drivers/tests/test_base.py
index 0b1a67b..ff94df8 100644
--- a/src/provisioningserver/drivers/tests/test_base.py
+++ b/src/provisioningserver/drivers/tests/test_base.py
@@ -34,7 +34,6 @@ from provisioningserver.utils.testing import RegistryFixture
class TestIpExtractor(MAASTestCase):
-
scenarios = (
(
"no-name",
diff --git a/src/provisioningserver/enum.py b/src/provisioningserver/enum.py
index c98b97c..0331a17 100644
--- a/src/provisioningserver/enum.py
+++ b/src/provisioningserver/enum.py
@@ -44,7 +44,6 @@ CONTROLLER_INSTALL_TYPE_CHOICES = enum_choices(CONTROLLER_INSTALL_TYPE)
class MACVLAN_MODE:
-
BRIDGE = "bridge"
PASSTHRU = "passthru"
PRIVATE = "private"
@@ -55,7 +54,6 @@ MACVLAN_MODE_CHOICES = enum_choices(MACVLAN_MODE)
class LIBVIRT_NETWORK:
-
DEFAULT = "default"
MAAS = "maas"
diff --git a/src/provisioningserver/kernel_opts.py b/src/provisioningserver/kernel_opts.py
index d1a67af..7ecbcf7 100644
--- a/src/provisioningserver/kernel_opts.py
+++ b/src/provisioningserver/kernel_opts.py
@@ -48,7 +48,6 @@ KernelParametersBase = namedtuple(
class KernelParameters(KernelParametersBase):
-
# foo._replace() is just ugly, so alias it to __call__.
__call__ = KernelParametersBase._replace
diff --git a/src/provisioningserver/power_driver_command.py b/src/provisioningserver/power_driver_command.py
index 88c975e..dc4ed4a 100644
--- a/src/provisioningserver/power_driver_command.py
+++ b/src/provisioningserver/power_driver_command.py
@@ -77,7 +77,6 @@ def _parse_args(argv):
async def _run(reactor, args, driver_registry=PowerDriverRegistry):
-
command = args.command
driver = driver_registry[args.driver]
context = _collect_context(driver.settings, args)
@@ -99,7 +98,6 @@ async def _run(reactor, args, driver_registry=PowerDriverRegistry):
def run(argv=None):
-
if argv is None:
argv = sys.argv[1:]
diff --git a/src/provisioningserver/prometheus/tests/test_utils.py b/src/provisioningserver/prometheus/tests/test_utils.py
index cc6d04c..53fe89e 100644
--- a/src/provisioningserver/prometheus/tests/test_utils.py
+++ b/src/provisioningserver/prometheus/tests/test_utils.py
@@ -22,7 +22,6 @@ class FailureCounterTestException(Exception):
class TestPrometheusMetrics(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/rackdservices/external.py b/src/provisioningserver/rackdservices/external.py
index 5b8afe5..4944b02 100644
--- a/src/provisioningserver/rackdservices/external.py
+++ b/src/provisioningserver/rackdservices/external.py
@@ -393,7 +393,6 @@ class RackSyslog(RackOnlyExternalService):
class RackExternalService(TimerService):
-
# Initial start the interval is low so that forwarders of bind9 gets
# at least one region controller. When no region controllers are set
# on the forwarders the interval is always set to the lower setting.
diff --git a/src/provisioningserver/rackdservices/http.py b/src/provisioningserver/rackdservices/http.py
index bda9d23..a245704 100644
--- a/src/provisioningserver/rackdservices/http.py
+++ b/src/provisioningserver/rackdservices/http.py
@@ -58,7 +58,6 @@ class HTTPConfigFail(Exception):
class RackHTTPService(TimerService):
-
# Initial start the interval is low so that proxy_pass of nginx gets
# at least one region controller. When no region controllers are set
# on the proxy_pass the interval is always set to the lower setting.
diff --git a/src/provisioningserver/rackdservices/tests/test_dhcp_probe_service.py b/src/provisioningserver/rackdservices/tests/test_dhcp_probe_service.py
index 97e9462..eb1e918 100644
--- a/src/provisioningserver/rackdservices/tests/test_dhcp_probe_service.py
+++ b/src/provisioningserver/rackdservices/tests/test_dhcp_probe_service.py
@@ -31,7 +31,6 @@ from provisioningserver.rpc.testing import MockLiveClusterToRegionRPCFixture
class TestDHCPProbeService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/rackdservices/tests/test_http.py b/src/provisioningserver/rackdservices/tests/test_http.py
index 8fbc92f..8001cb1 100644
--- a/src/provisioningserver/rackdservices/tests/test_http.py
+++ b/src/provisioningserver/rackdservices/tests/test_http.py
@@ -381,7 +381,6 @@ class TestHTTPLogResource(MAASTestCase):
class TestHTTPBootResource(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
diff --git a/src/provisioningserver/rackdservices/tests/test_image_download_service.py b/src/provisioningserver/rackdservices/tests/test_image_download_service.py
index f8daa4e..00e856e 100644
--- a/src/provisioningserver/rackdservices/tests/test_image_download_service.py
+++ b/src/provisioningserver/rackdservices/tests/test_image_download_service.py
@@ -32,7 +32,6 @@ from provisioningserver.rpc.exceptions import NoConnectionsAvailable
class TestPeriodicImageDownloadService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/rackdservices/tests/test_lease_socket_service.py b/src/provisioningserver/rackdservices/tests/test_lease_socket_service.py
index 72690f9..4433884 100644
--- a/src/provisioningserver/rackdservices/tests/test_lease_socket_service.py
+++ b/src/provisioningserver/rackdservices/tests/test_lease_socket_service.py
@@ -31,7 +31,6 @@ from provisioningserver.utils.twisted import DeferredValue, pause, retries
class TestLeaseSocketService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/rackdservices/tests/test_networks_monitoring_service.py b/src/provisioningserver/rackdservices/tests/test_networks_monitoring_service.py
index 9a2ec02..217303a 100644
--- a/src/provisioningserver/rackdservices/tests/test_networks_monitoring_service.py
+++ b/src/provisioningserver/rackdservices/tests/test_networks_monitoring_service.py
@@ -26,7 +26,6 @@ from provisioningserver.utils import services as services_module
class TestRackNetworksMonitoringService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
debug=True, timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/rackdservices/tests/test_node_power_monitor_service.py b/src/provisioningserver/rackdservices/tests/test_node_power_monitor_service.py
index 99b5161..1ef7284 100644
--- a/src/provisioningserver/rackdservices/tests/test_node_power_monitor_service.py
+++ b/src/provisioningserver/rackdservices/tests/test_node_power_monitor_service.py
@@ -29,7 +29,6 @@ from provisioningserver.rpc.testing import MockClusterToRegionRPCFixture
class TestNodePowerMonitorService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/rackdservices/tests/test_service_monitor_service.py b/src/provisioningserver/rackdservices/tests/test_service_monitor_service.py
index 7f467ed..bc2ea98 100644
--- a/src/provisioningserver/rackdservices/tests/test_service_monitor_service.py
+++ b/src/provisioningserver/rackdservices/tests/test_service_monitor_service.py
@@ -30,7 +30,6 @@ from provisioningserver.utils.service_monitor import (
class TestServiceMonitorService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/rackdservices/tests/test_tftp.py b/src/provisioningserver/rackdservices/tests/test_tftp.py
index 8f8a301..4a0ad0e 100644
--- a/src/provisioningserver/rackdservices/tests/test_tftp.py
+++ b/src/provisioningserver/rackdservices/tests/test_tftp.py
@@ -997,7 +997,6 @@ class TestTFTPService(MAASTestCase):
class FakeStreamSession:
-
cancelled = False
def cancel(self):
@@ -1052,7 +1051,6 @@ class TestTransferTimeTrackingTFTP(MAASTestCase):
class TestTransferTimeTrackingTFTPStartSession(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
@@ -1156,7 +1154,6 @@ class TestPort(MAASTestCase):
class TestUDPServer(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_getPort_calls__listenUDP_with_args_from_constructor(self):
diff --git a/src/provisioningserver/rackdservices/tests/test_version_update_check.py b/src/provisioningserver/rackdservices/tests/test_version_update_check.py
index 8239d4d..79cb6b8 100644
--- a/src/provisioningserver/rackdservices/tests/test_version_update_check.py
+++ b/src/provisioningserver/rackdservices/tests/test_version_update_check.py
@@ -37,7 +37,6 @@ class SampleVersionUpdateCheckService(VersionUpdateCheckService):
class TestVersionUpdateCheckService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
debug=True, timeout=get_testing_timeout()
)
@@ -62,7 +61,6 @@ class TestVersionUpdateCheckService(MAASTestCase):
class TestRackVersionUpdateCheckService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
debug=True, timeout=get_testing_timeout()
)
diff --git a/src/provisioningserver/refresh/maas_api_helper.py b/src/provisioningserver/refresh/maas_api_helper.py
index 1cbefdb..1d8dd7e 100644
--- a/src/provisioningserver/refresh/maas_api_helper.py
+++ b/src/provisioningserver/refresh/maas_api_helper.py
@@ -41,7 +41,6 @@ class InvalidCredentialsFormat(Exception):
# This would be a dataclass, but needs to support python3.5
class Credentials:
-
KEYS = frozenset(
("token_key", "token_secret", "consumer_key", "consumer_secret")
)
diff --git a/src/provisioningserver/refresh/tests/test_refresh.py b/src/provisioningserver/refresh/tests/test_refresh.py
index 66678bd..2a37d8e 100644
--- a/src/provisioningserver/refresh/tests/test_refresh.py
+++ b/src/provisioningserver/refresh/tests/test_refresh.py
@@ -26,7 +26,6 @@ from provisioningserver.refresh.node_info_scripts import (
class FakeResponse:
-
status = 200
@@ -367,7 +366,6 @@ class TestRefresh(MAASTestCase):
)
def test_refresh_clears_up_temporary_directory(self):
-
ScriptsBroken = factory.make_exception_type()
def find_temporary_directories():
diff --git a/src/provisioningserver/rpc/interfaces.py b/src/provisioningserver/rpc/interfaces.py
index c476067..848f926 100644
--- a/src/provisioningserver/rpc/interfaces.py
+++ b/src/provisioningserver/rpc/interfaces.py
@@ -8,7 +8,6 @@ from zope import interface
class IConnection(interface.Interface):
-
ident = interface.Attribute(
"ident", "An identifier for the far end of the connection."
)
@@ -26,7 +25,6 @@ class IConnection(interface.Interface):
class IConnectionToRegion(IConnection):
-
localIdent = interface.Attribute(
"ident", "An identifier for this end of the connection."
)
diff --git a/src/provisioningserver/rpc/tests/test_arguments.py b/src/provisioningserver/rpc/tests/test_arguments.py
index 8021753..3565b9d 100644
--- a/src/provisioningserver/rpc/tests/test_arguments.py
+++ b/src/provisioningserver/rpc/tests/test_arguments.py
@@ -58,7 +58,6 @@ class TestChoice(MAASTestCase):
class TestStructureAsJSON(MAASTestCase):
-
example = {
"an": "example",
"structure": 12.34,
@@ -77,7 +76,6 @@ class TestStructureAsJSON(MAASTestCase):
@attr.s
class SampleAttrs:
-
foo = attr.ib(converter=str)
bar = attr.ib(converter=int)
@@ -164,7 +162,6 @@ class TestCompressedAmpList(MAASTestCase):
class TestIPAddress(MAASTestCase):
-
argument = arguments.IPAddress()
def test_round_trips_ipv4_address(self):
@@ -193,7 +190,6 @@ class TestIPAddress(MAASTestCase):
class TestIPNetwork(MAASTestCase):
-
argument = arguments.IPNetwork()
def test_round_trips_ipv4_address(self):
diff --git a/src/provisioningserver/rpc/tests/test_boot_images.py b/src/provisioningserver/rpc/tests/test_boot_images.py
index 02731e0..98be874 100644
--- a/src/provisioningserver/rpc/tests/test_boot_images.py
+++ b/src/provisioningserver/rpc/tests/test_boot_images.py
@@ -260,7 +260,6 @@ class TestRunImport(MAASTestCase):
class TestImportBootImages(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -410,7 +409,6 @@ class TestImportBootImages(MAASTestCase):
class TestIsImportBootImagesRunning(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@defer.inlineCallbacks
diff --git a/src/provisioningserver/rpc/tests/test_clusterservice.py b/src/provisioningserver/rpc/tests/test_clusterservice.py
index 4d24564..38a3247 100644
--- a/src/provisioningserver/rpc/tests/test_clusterservice.py
+++ b/src/provisioningserver/rpc/tests/test_clusterservice.py
@@ -133,7 +133,6 @@ TIMEOUT = get_testing_timeout()
class TestClusterProtocol_Identify(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_identify_is_registered(self):
@@ -153,7 +152,6 @@ class TestClusterProtocol_Identify(MAASTestCase):
class TestClusterProtocol_Authenticate(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_authenticate_is_registered(self):
@@ -178,7 +176,6 @@ class TestClusterProtocol_Authenticate(MAASTestCase):
class TestClusterProtocol_StartTLS(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_StartTLS_is_registered(self):
@@ -210,7 +207,6 @@ class TestClusterProtocol_StartTLS(MAASTestCase):
class TestClusterProtocol_ListBootImages(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_list_boot_images_is_registered(self):
@@ -292,7 +288,6 @@ class TestClusterProtocol_ListBootImages(MAASTestCase):
class TestClusterProtocol_ImportBootImages(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_import_boot_images_is_registered(self):
@@ -386,7 +381,6 @@ class TestClusterProtocol_ImportBootImages(MAASTestCase):
class TestClusterProtocol_IsImportBootImagesRunning(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_import_boot_images_running_is_registered(self):
@@ -420,7 +414,6 @@ class TestClusterProtocol_IsImportBootImagesRunning(MAASTestCase):
class TestClusterProtocol_DescribePowerTypes(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_describe_power_types_is_registered(self):
@@ -456,7 +449,6 @@ def make_inert_client_service(max_idle_conns=1, max_conns=1, keepalive=1):
class TestClusterClientService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def fakeAgentResponse(self, data="", code=200):
@@ -1474,7 +1466,6 @@ class TestClusterClientService(MAASTestCase):
class TestClusterClientServiceIntervals(MAASTestCase):
-
scenarios = (
(
"initial",
@@ -1547,7 +1538,6 @@ class TestClusterClientServiceIntervals(MAASTestCase):
class TestClusterClient(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -2089,7 +2079,6 @@ class TestClusterClient(MAASTestCase):
class TestClusterClientCheckerService(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def make_client(self):
@@ -2152,7 +2141,6 @@ class TestClusterClientCheckerService(MAASTestCase):
class TestClusterProtocol_ListSupportedArchitectures(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -2176,7 +2164,6 @@ class TestClusterProtocol_ListSupportedArchitectures(MAASTestCase):
class TestClusterProtocol_ListOperatingSystems(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -2219,7 +2206,6 @@ class TestClusterProtocol_ListOperatingSystems(MAASTestCase):
class TestClusterProtocol_GetOSReleaseTitle(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -2269,7 +2255,6 @@ class TestClusterProtocol_GetOSReleaseTitle(MAASTestCase):
class TestClusterProtocol_ValidateLicenseKey(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -2322,7 +2307,6 @@ class TestClusterProtocol_ValidateLicenseKey(MAASTestCase):
class TestClusterProtocol_GetPreseedData(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def make_arguments(self):
@@ -2395,7 +2379,6 @@ class TestClusterProtocol_GetPreseedData(MAASTestCase):
class TestClusterProtocol_PowerOn_PowerOff_PowerCycle(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
scenarios = (
@@ -2551,7 +2534,6 @@ class TestClusterProtocol_PowerOn_PowerOff_PowerCycle(MAASTestCase):
class TestClusterProtocol_PowerQuery(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -2634,7 +2616,6 @@ class TestClusterProtocol_PowerQuery(MAASTestCase):
class TestClusterProtocol_SetBootOrder(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -2748,7 +2729,6 @@ class TestClusterProtocol_SetBootOrder(MAASTestCase):
class TestClusterProtocol_ConfigureDHCP(MAASTestCase):
-
scenarios = (
(
"DHCPv4",
@@ -2915,7 +2895,6 @@ class TestClusterProtocol_ConfigureDHCP(MAASTestCase):
class TestClusterProtocol_ValidateDHCP(MAASTestCase):
-
scenarios = (
(
"DHCPv4",
@@ -3036,7 +3015,6 @@ class TestClusterProtocol_ValidateDHCP(MAASTestCase):
class TestClusterProtocol_EvaluateTag(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -3153,7 +3131,6 @@ class MAASTestCaseThatWaitsForDeferredThreads(MAASTestCase):
class TestClusterProtocol_ScanNetworks(
MAASTestCaseThatWaitsForDeferredThreads
):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -3356,7 +3333,6 @@ class TestClusterProtocol_ScanNetworks(
class TestClusterProtocol_AddChassis(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -4118,7 +4094,6 @@ class TestClusterProtocol_AddChassis(MAASTestCase):
class TestClusterProtocol_DiscoverPodProjects(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -4160,7 +4135,6 @@ class TestClusterProtocol_DiscoverPodProjects(MAASTestCase):
class TestClusterProtocol_DiscoverPod(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -4209,7 +4183,6 @@ class TestClusterProtocol_DiscoverPod(MAASTestCase):
class TestClusterProtocol_SendPodCommissioningResults(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -4329,7 +4302,6 @@ class TestClusterProtocol_ComposeMachine(MAASTestCase):
class TestClusterProtocol_DecomposeMachine(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -4370,7 +4342,6 @@ class TestClusterProtocol_DecomposeMachine(MAASTestCase):
class TestClusterProtocol_DisableAndShutoffRackd(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
@@ -4445,7 +4416,6 @@ class TestClusterProtocol_DisableAndShutoffRackd(MAASTestCase):
class TestClusterProtocol_CheckIPs(MAASTestCaseThatWaitsForDeferredThreads):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_is_registered(self):
diff --git a/src/provisioningserver/rpc/tests/test_common.py b/src/provisioningserver/rpc/tests/test_common.py
index ffd5ed9..ab29eb9 100644
--- a/src/provisioningserver/rpc/tests/test_common.py
+++ b/src/provisioningserver/rpc/tests/test_common.py
@@ -237,7 +237,6 @@ class TestRPCProtocol(MAASTestCase):
class TestRPCProtocol_UnhandledErrorsWhenHandlingResponses(MAASTestCase):
-
answer_seq = b"%d" % random.randrange(0, 2**32)
answer_box = amp.AmpBox(_answer=answer_seq)
diff --git a/src/provisioningserver/rpc/tests/test_connectionpool.py b/src/provisioningserver/rpc/tests/test_connectionpool.py
index 2f0096c..9506130 100644
--- a/src/provisioningserver/rpc/tests/test_connectionpool.py
+++ b/src/provisioningserver/rpc/tests/test_connectionpool.py
@@ -20,7 +20,6 @@ TIMEOUT = get_testing_timeout()
class TestConnectionPool(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_setitem_sets_item_in_connections(self):
diff --git a/src/provisioningserver/rpc/tests/test_dhcp.py b/src/provisioningserver/rpc/tests/test_dhcp.py
index c66c219..79ceba8 100644
--- a/src/provisioningserver/rpc/tests/test_dhcp.py
+++ b/src/provisioningserver/rpc/tests/test_dhcp.py
@@ -602,7 +602,6 @@ class TestUpdateHosts(MAASTestCase):
class TestConfigureDHCP(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
@@ -1336,7 +1335,6 @@ class TestConfigureDHCP(MAASTestCase):
class TestValidateDHCP(MAASTestCase):
-
scenarios = (
("DHCPv4", {"server": dhcp.DHCPv4Server}),
("DHCPv6", {"server": dhcp.DHCPv6Server}),
diff --git a/src/provisioningserver/rpc/tests/test_docs.py b/src/provisioningserver/rpc/tests/test_docs.py
index 4c90cbb..036050e 100644
--- a/src/provisioningserver/rpc/tests/test_docs.py
+++ b/src/provisioningserver/rpc/tests/test_docs.py
@@ -31,7 +31,6 @@ def get_commands(module):
class TestDocs(MAASTestCase):
-
scenarios = sorted(
(command.__name__, {"command": command})
for command in chain(
diff --git a/src/provisioningserver/rpc/tests/test_osystems.py b/src/provisioningserver/rpc/tests/test_osystems.py
index 83bbc29..89f849e 100644
--- a/src/provisioningserver/rpc/tests/test_osystems.py
+++ b/src/provisioningserver/rpc/tests/test_osystems.py
@@ -186,7 +186,6 @@ class TestGetPreseedDataErrors(MAASTestCase):
class TestGetPreseedData(MAASTestCase):
-
# Check for every OS.
scenarios = [
(osystem.name, {"osystem": osystem})
diff --git a/src/provisioningserver/rpc/tests/test_pods.py b/src/provisioningserver/rpc/tests/test_pods.py
index 1f68511..532b0cd 100644
--- a/src/provisioningserver/rpc/tests/test_pods.py
+++ b/src/provisioningserver/rpc/tests/test_pods.py
@@ -38,7 +38,6 @@ TIMEOUT = get_testing_timeout()
class TestDiscoverPodProjects(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
@@ -79,7 +78,6 @@ class TestDiscoverPodProjects(MAASTestCase):
class TestDiscoverPod(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
@@ -199,7 +197,6 @@ class TestDiscoverPod(MAASTestCase):
class TestComposeMachine(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def make_requested_machine(self):
@@ -389,7 +386,6 @@ class TestComposeMachine(MAASTestCase):
class TestSendPodCommissioningResults(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
@@ -580,7 +576,6 @@ class TestSendPodCommissioningResults(MAASTestCase):
class TestDecomposeMachine(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
diff --git a/src/provisioningserver/rpc/tests/test_power.py b/src/provisioningserver/rpc/tests/test_power.py
index 2c9aa71..b8fb728 100644
--- a/src/provisioningserver/rpc/tests/test_power.py
+++ b/src/provisioningserver/rpc/tests/test_power.py
@@ -63,7 +63,6 @@ def suppress_reporting(test):
class TestPowerHelpers(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -160,7 +159,6 @@ class TestPowerHelpers(MAASTestCase):
class TestChangePowerState(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -439,7 +437,6 @@ class TestChangePowerState(MAASTestCase):
class TestMaybeChangePowerState(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -758,7 +755,6 @@ class TestMaybeChangePowerState(MAASTestCase):
class TestPowerQuery(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -927,7 +923,6 @@ class TestPowerQuery(MAASTestCase):
class TestPowerQueryExceptions(MAASTestCase):
-
scenarios = tuple(
(
driver.name,
@@ -1030,7 +1025,6 @@ class TestPowerQueryExceptions(MAASTestCase):
class TestPowerQueryAsync(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
diff --git a/src/provisioningserver/rpc/tests/test_utils.py b/src/provisioningserver/rpc/tests/test_utils.py
index 1733858..af78214 100644
--- a/src/provisioningserver/rpc/tests/test_utils.py
+++ b/src/provisioningserver/rpc/tests/test_utils.py
@@ -26,7 +26,6 @@ TIMEOUT = get_testing_timeout()
class TestCreateNode(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
@@ -186,7 +185,6 @@ class TestCreateNode(MAASTestCase):
class TestCommissionNode(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def setUp(self):
diff --git a/src/provisioningserver/service_monitor.py b/src/provisioningserver/service_monitor.py
index 4fcfe19..20d7642 100644
--- a/src/provisioningserver/service_monitor.py
+++ b/src/provisioningserver/service_monitor.py
@@ -20,14 +20,12 @@ class HTTPService(AlwaysOnService):
class DHCPv4Service(ToggleableService):
-
name = "dhcpd"
service_name = "maas-dhcpd"
snap_service_name = "dhcpd"
class DHCPv6Service(ToggleableService):
-
name = "dhcpd6"
service_name = "maas-dhcpd6"
snap_service_name = "dhcpd6"
diff --git a/src/provisioningserver/testing/os.py b/src/provisioningserver/testing/os.py
index 7630fdb..5d98b68 100644
--- a/src/provisioningserver/testing/os.py
+++ b/src/provisioningserver/testing/os.py
@@ -12,7 +12,6 @@ from provisioningserver.drivers.osystem import (
class FakeOS(OperatingSystem):
-
name = ""
title = ""
@@ -50,7 +49,6 @@ def make_osystem(testcase, osystem, purpose=None, releases=None):
return fake
else:
-
obj = OperatingSystemRegistry[osystem]
old_func = obj.get_boot_image_purposes
testcase.patch(obj, "get_boot_image_purposes").return_value = purpose
diff --git a/src/provisioningserver/tests/test_power_driver_command.py b/src/provisioningserver/tests/test_power_driver_command.py
index 93b1861..62937ba 100644
--- a/src/provisioningserver/tests/test_power_driver_command.py
+++ b/src/provisioningserver/tests/test_power_driver_command.py
@@ -38,13 +38,11 @@ class FakeDriver(PowerDriver):
class TestPowerDriverCommand(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(
timeout=get_testing_timeout()
)
def test_create_subparser(self):
-
parser = ArgumentParser()
driver_settings = [
{
@@ -69,7 +67,6 @@ class TestPowerDriverCommand(MAASTestCase):
self.assertEqual(args.version, "1")
def test_parse_args_virsh(self):
-
args = power_driver_command._parse_args(
[
"on",
@@ -109,7 +106,6 @@ class TestPowerDriverCommand(MAASTestCase):
@inlineCallbacks
def test_run(self):
-
args = Namespace()
args.command = "on"
args.driver = "fake"
diff --git a/src/provisioningserver/tests/test_support_dump.py b/src/provisioningserver/tests/test_support_dump.py
index cfaceba..5e62ec8 100644
--- a/src/provisioningserver/tests/test_support_dump.py
+++ b/src/provisioningserver/tests/test_support_dump.py
@@ -13,7 +13,6 @@ from provisioningserver import support_dump
class TestUpdateMaasClusterConf(MAASTestCase):
-
# Test to ensure that if exceptions are thrown during the dump, the dump
# continues through all the items to dump anyway.
scenarios = (
diff --git a/src/provisioningserver/tests/test_tags.py b/src/provisioningserver/tests/test_tags.py
index d148c07..9f9c689 100644
--- a/src/provisioningserver/tests/test_tags.py
+++ b/src/provisioningserver/tests/test_tags.py
@@ -90,7 +90,6 @@ class EqualsXML(Equals):
class TestMergeDetailsCleanly(MAASTestCase):
-
do_merge_details = staticmethod(tags.merge_details_cleanly)
def setUp(self):
diff --git a/src/provisioningserver/utils/deb.py b/src/provisioningserver/utils/deb.py
index 6e0656e..afa6aa5 100644
--- a/src/provisioningserver/utils/deb.py
+++ b/src/provisioningserver/utils/deb.py
@@ -63,7 +63,10 @@ def get_deb_versions_info(apt_pkg=None) -> Optional[DebVersionsInfo]:
policy = apt_pkg.Policy(cache)
policy.init_defaults()
- current, update, = (
+ (
+ current,
+ update,
+ ) = (
None,
None,
)
diff --git a/src/provisioningserver/utils/lxd.py b/src/provisioningserver/utils/lxd.py
index 9054780..d751bf1 100644
--- a/src/provisioningserver/utils/lxd.py
+++ b/src/provisioningserver/utils/lxd.py
@@ -20,7 +20,6 @@ def lxd_cpu_speed(data):
@dataclass
class NUMANode:
-
memory: int = 0
cores: List = field(default_factory=list)
hugepages: int = 0
diff --git a/src/provisioningserver/utils/testing.py b/src/provisioningserver/utils/testing.py
index 3011723..25461c0 100644
--- a/src/provisioningserver/utils/testing.py
+++ b/src/provisioningserver/utils/testing.py
@@ -22,7 +22,6 @@ class RegistryFixture(Fixture):
class MAASFileBackedValueFixture(Fixture):
-
FILE_BACKED_VALUE = None
def __init__(self, value):
diff --git a/src/provisioningserver/utils/tests/test_dhclient.py b/src/provisioningserver/utils/tests/test_dhclient.py
index 2dbeaf1..99d24f0 100644
--- a/src/provisioningserver/utils/tests/test_dhclient.py
+++ b/src/provisioningserver/utils/tests/test_dhclient.py
@@ -19,7 +19,6 @@ from provisioningserver.utils.fs import atomic_write
class TestGetLatestFixedAddress(MAASTestCase):
-
IPV4_LEASE_FILE = dedent(
"""\
lease {
diff --git a/src/provisioningserver/utils/tests/test_fs.py b/src/provisioningserver/utils/tests/test_fs.py
index 8896d3c..ec7dcdc 100644
--- a/src/provisioningserver/utils/tests/test_fs.py
+++ b/src/provisioningserver/utils/tests/test_fs.py
@@ -176,7 +176,6 @@ class TestAtomicWrite(MAASTestCase):
self.assertEqual(mode, stat.S_IMODE(os.stat(atomic_file).st_mode))
def test_atomic_write_sets_permissions_before_moving_into_place(self):
-
recorded_modes = []
def record_mode(source, dest):
diff --git a/src/provisioningserver/utils/tests/test_network.py b/src/provisioningserver/utils/tests/test_network.py
index 9df9adf..474b57c 100644
--- a/src/provisioningserver/utils/tests/test_network.py
+++ b/src/provisioningserver/utils/tests/test_network.py
@@ -2489,7 +2489,6 @@ class TestConvertHostToUriStr(MAASTestCase):
class TestGetIfnameForLabel(MAASTestCase):
-
scenarios = [
("numeric", {"input": "0", "expected": "eth0"}),
(
diff --git a/src/provisioningserver/utils/tests/test_ps.py b/src/provisioningserver/utils/tests/test_ps.py
index 7101185..7644a85 100644
--- a/src/provisioningserver/utils/tests/test_ps.py
+++ b/src/provisioningserver/utils/tests/test_ps.py
@@ -69,7 +69,6 @@ IN_LXC_CONTAINER = dedent(
class TestIsPIDRunning(MAASTestCase):
-
scenarios = (
("running", {"result": True, "exception": None}),
("lookup-error", {"result": False, "exception": ProcessLookupError()}),
@@ -83,7 +82,6 @@ class TestIsPIDRunning(MAASTestCase):
class TestIsPIDInContainer(MAASTestCase):
-
scenarios = (
("not_in_container", {"result": False, "cgroup": NOT_IN_CONTAINER}),
(
diff --git a/src/provisioningserver/utils/tests/test_service_monitor.py b/src/provisioningserver/utils/tests/test_service_monitor.py
index d802409..8763a9c 100644
--- a/src/provisioningserver/utils/tests/test_service_monitor.py
+++ b/src/provisioningserver/utils/tests/test_service_monitor.py
@@ -1452,7 +1452,6 @@ class TestServiceMonitor(MAASTestCase):
class TestToggleableService(MAASTestCase):
def make_toggleable_service(self):
class FakeToggleableService(ToggleableService):
-
name = factory.make_name("name")
service_name = factory.make_name("service")
snap_service_name = factory.make_name("service")
diff --git a/src/provisioningserver/utils/tests/test_services.py b/src/provisioningserver/utils/tests/test_services.py
index 5afbbce..78c3352 100644
--- a/src/provisioningserver/utils/tests/test_services.py
+++ b/src/provisioningserver/utils/tests/test_services.py
@@ -182,7 +182,6 @@ class FakeRefresher:
class SampleSingleInstanceService(SingleInstanceService):
-
SERVICE_NAME = "sample"
LOCK_NAME = "sample-lock"
INTERVAL = timedelta(minutes=1)
diff --git a/src/provisioningserver/utils/tests/test_tftp.py b/src/provisioningserver/utils/tests/test_tftp.py
index 66261e5..11223b0 100644
--- a/src/provisioningserver/utils/tests/test_tftp.py
+++ b/src/provisioningserver/utils/tests/test_tftp.py
@@ -12,7 +12,6 @@ from provisioningserver.utils import tftp
class TestAddressFunctions(MAASTestCase):
-
scenarios = (
(
"get_local_address",
diff --git a/src/provisioningserver/utils/tests/test_twisted.py b/src/provisioningserver/utils/tests/test_twisted.py
index 4dddf7f..61ae63e 100644
--- a/src/provisioningserver/utils/tests/test_twisted.py
+++ b/src/provisioningserver/utils/tests/test_twisted.py
@@ -102,7 +102,6 @@ def return_args(*args, **kwargs):
class TestAsynchronousDecorator(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_calls_in_current_thread_when_current_thread_is_reactor(self):
@@ -143,7 +142,6 @@ def noop():
class TestThreadDeferred(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
@@ -157,7 +155,6 @@ class TestThreadDeferred(MAASTestCase):
class TestAsynchronousDecoratorWithTimeout(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
def test_timeout_cannot_be_None(self):
@@ -180,7 +177,6 @@ class TestAsynchronousDecoratorWithTimeout(MAASTestCase):
class TestAsynchronousDecoratorWithTimeoutDefined(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
scenarios = (
@@ -238,7 +234,6 @@ class TestAsynchronousDecoratorWithTimeoutDefined(MAASTestCase):
class TestSynchronousDecorator(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@synchronous
@@ -451,7 +446,6 @@ class TestRetries(MAASTestCase):
class TestPause(MAASTestCase):
-
p_deferred_called = AfterPreprocessing(lambda d: bool(d.called), Is(True))
p_deferred_cancelled = AfterPreprocessing(
lambda d: d.result,
@@ -1254,7 +1248,6 @@ class TestRPCFetcher(MAASTestCase):
class TestDeferToNewThread(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
@@ -1860,7 +1853,6 @@ class TestThreadPoolLimiter(MAASTestCase):
class TestMakeDeferredWithProcessProtocol(MAASTestCase):
-
run_tests_with = MAASTwistedRunTest.make_factory(timeout=TIMEOUT)
@inlineCallbacks
diff --git a/src/provisioningserver/utils/tests/test_url.py b/src/provisioningserver/utils/tests/test_url.py
index 691da46..546b884 100644
--- a/src/provisioningserver/utils/tests/test_url.py
+++ b/src/provisioningserver/utils/tests/test_url.py
@@ -107,7 +107,6 @@ class TestComposeURL(MAASTestCase):
class TestSplithost(MAASTestCase):
-
scenarios = (
("ipv4", {"host": "192.168.1.1:21", "result": ("192.168.1.1", 21)}),
("ipv6", {"host": "[::f]:21", "result": ("[::f]", 21)}),
diff --git a/src/provisioningserver/utils/tests/test_version.py b/src/provisioningserver/utils/tests/test_version.py
index e7fd2fe..0297b73 100644
--- a/src/provisioningserver/utils/tests/test_version.py
+++ b/src/provisioningserver/utils/tests/test_version.py
@@ -15,7 +15,6 @@ from provisioningserver.utils.version import (
class TestGetVersionFromPythonPackage(MAASTestCase):
-
scenarios = [
(
"final",
@@ -76,7 +75,6 @@ class TestGetMAASRepoHash(MAASTestCase):
class TestMAASVersionScenarios(MAASTestCase):
-
scenarios = (
(
"version only",
diff --git a/src/provisioningserver/utils/tests/test_xpath.py b/src/provisioningserver/utils/tests/test_xpath.py
index 927c3ec..7e3ba06 100644
--- a/src/provisioningserver/utils/tests/test_xpath.py
+++ b/src/provisioningserver/utils/tests/test_xpath.py
@@ -19,7 +19,6 @@ from provisioningserver.utils.xpath import try_match_xpath
class TestTryMatchXPathScenarios(MAASTestCase):
-
doctest_flags = doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE
def scenario(name, xpath, doc, expected_result, expected_log=""):
diff --git a/src/provisioningserver/utils/twisted.py b/src/provisioningserver/utils/twisted.py
index fb46e81..672c7b9 100644
--- a/src/provisioningserver/utils/twisted.py
+++ b/src/provisioningserver/utils/twisted.py
@@ -740,7 +740,6 @@ class ThreadUnpool:
self.started = False
def callInThread(self, func, *args, **kwargs):
-
"""See :class:`twisted.python.threadpool.ThreadPool`.
:return: a `Deferred`, which is mainly intended for testing.
Follow ups