Merge branch 'devel' into feature_constructed-inventory

awx/main/access.py

@@ -561,7 +561,6 @@ class NotificationAttachMixin(BaseAccess):
 
 
 class InstanceAccess(BaseAccess):
-
     model = Instance
     prefetch_related = ('rampart_groups',)
 
@@ -579,7 +578,6 @@ class InstanceAccess(BaseAccess):
         return super(InstanceAccess, self).can_unattach(obj, sub_obj, relationship, relationship, data=data)
 
     def can_add(self, data):
-
         return self.user.is_superuser
 
     def can_change(self, obj, data):
@@ -590,7 +588,6 @@ class InstanceAccess(BaseAccess):
 
 
 class InstanceGroupAccess(BaseAccess):
-
     model = InstanceGroup
     prefetch_related = ('instances',)
 
@@ -1030,7 +1027,9 @@ class GroupAccess(BaseAccess):
         return Group.objects.filter(inventory__in=Inventory.accessible_pk_qs(self.user, 'read_role'))
 
     def can_add(self, data):
-        if not data or 'inventory' not in data:
+        if not data:  # So the browseable API will work
+            return Inventory.accessible_objects(self.user, 'admin_role').exists()
+        if 'inventory' not in data:
             return False
         # Checks for admin or change permission on inventory.
         return self.check_related('inventory', Inventory, data)
@@ -2352,7 +2351,6 @@ class JobEventAccess(BaseAccess):
 
 
 class UnpartitionedJobEventAccess(JobEventAccess):
-
     model = UnpartitionedJobEvent
 
 

awx/main/apps.py

@@ -3,6 +3,5 @@ from django.utils.translation import gettext_lazy as _
 
 
 class MainConfig(AppConfig):
-
     name = 'awx.main'
     verbose_name = _('Main')

awx/main/dispatch/control.py

@@ -14,7 +14,6 @@ logger = logging.getLogger('awx.main.dispatch')
 
 
 class Control(object):
-
     services = ('dispatcher', 'callback_receiver')
     result = None
 

awx/main/dispatch/pool.py

@@ -192,7 +192,6 @@ class PoolWorker(object):
 
 
 class StatefulPoolWorker(PoolWorker):
-
     track_managed_tasks = True
 
 

awx/main/dispatch/publish.py

@@ -66,7 +66,6 @@ class task:
         bind_kwargs = self.bind_kwargs
 
         class PublisherMixin(object):
-
             queue = None
 
             @classmethod

awx/main/dispatch/worker/base.py

@@ -40,7 +40,6 @@ class WorkerSignalHandler:
 
 
 class AWXConsumerBase(object):
-
     last_stats = time.time()
 
     def __init__(self, name, worker, queues=[], pool=None):

awx/main/fields.py

@@ -232,7 +232,6 @@ class ImplicitRoleField(models.ForeignKey):
             field_names = [field_names]
 
         for field_name in field_names:
-
             if field_name.startswith('singleton:'):
                 continue
 
@@ -244,7 +243,6 @@ class ImplicitRoleField(models.ForeignKey):
             field = getattr(cls, field_name, None)
 
             if field and type(field) is ReverseManyToOneDescriptor or type(field) is ManyToManyDescriptor:
-
                 if '.' in field_attr:
                     raise Exception('Referencing deep roles through ManyToMany fields is unsupported.')
 
@@ -629,7 +627,6 @@ class CredentialInputField(JSONSchemaField):
         # `ssh_key_unlock` requirements are very specific and can't be
         # represented without complicated JSON schema
         if model_instance.credential_type.managed is True and 'ssh_key_unlock' in defined_fields:
-
             # in order to properly test the necessity of `ssh_key_unlock`, we
             # need to know the real value of `ssh_key_data`; for a payload like:
             # {
@@ -791,7 +788,8 @@ class CredentialTypeInjectorField(JSONSchemaField):
                     'type': 'object',
                     'patternProperties': {
                         # http://docs.ansible.com/ansible/playbooks_variables.html#what-makes-a-valid-variable-name
-                        '^[a-zA-Z_]+[a-zA-Z0-9_]*$': {'type': 'string'},
+                        # plus, add ability to template
+                        r'^[a-zA-Z_\{\}]+[a-zA-Z0-9_\{\}]*$': {"anyOf": [{'type': 'string'}, {'type': 'array'}, {'$ref': '#/properties/extra_vars'}]}
                     },
                     'additionalProperties': False,
                 },
@@ -858,27 +856,44 @@ class CredentialTypeInjectorField(JSONSchemaField):
                 template_name = template_name.split('.')[1]
                 setattr(valid_namespace['tower'].filename, template_name, 'EXAMPLE_FILENAME')
 
+        def validate_template_string(type_, key, tmpl):
+            try:
+                sandbox.ImmutableSandboxedEnvironment(undefined=StrictUndefined).from_string(tmpl).render(valid_namespace)
+            except UndefinedError as e:
+                raise django_exceptions.ValidationError(
+                    _('{sub_key} uses an undefined field ({error_msg})').format(sub_key=key, error_msg=e),
+                    code='invalid',
+                    params={'value': value},
+                )
+            except SecurityError as e:
+                raise django_exceptions.ValidationError(_('Encountered unsafe code execution: {}').format(e))
+            except TemplateSyntaxError as e:
+                raise django_exceptions.ValidationError(
+                    _('Syntax error rendering template for {sub_key} inside of {type} ({error_msg})').format(sub_key=key, type=type_, error_msg=e),
+                    code='invalid',
+                    params={'value': value},
+                )
+
+        def validate_extra_vars(key, node):
+            if isinstance(node, dict):
+                for k, v in node.items():
+                    validate_template_string("extra_vars", 'a key' if key is None else key, k)
+                    validate_extra_vars(k if key is None else "{key}.{k}".format(key=key, k=k), v)
+            elif isinstance(node, list):
+                for i, x in enumerate(node):
+                    validate_extra_vars("{key}[{i}]".format(key=key, i=i), x)
+            else:
+                validate_template_string("extra_vars", key, node)
+
         for type_, injector in value.items():
             if type_ == 'env':
                 for key in injector.keys():
                     self.validate_env_var_allowed(key)
-            for key, tmpl in injector.items():
-                try:
-                    sandbox.ImmutableSandboxedEnvironment(undefined=StrictUndefined).from_string(tmpl).render(valid_namespace)
-                except UndefinedError as e:
-                    raise django_exceptions.ValidationError(
-                        _('{sub_key} uses an undefined field ({error_msg})').format(sub_key=key, error_msg=e),
-                        code='invalid',
-                        params={'value': value},
-                    )
-                except SecurityError as e:
-                    raise django_exceptions.ValidationError(_('Encountered unsafe code execution: {}').format(e))
-                except TemplateSyntaxError as e:
-                    raise django_exceptions.ValidationError(
-                        _('Syntax error rendering template for {sub_key} inside of {type} ({error_msg})').format(sub_key=key, type=type_, error_msg=e),
-                        code='invalid',
-                        params={'value': value},
-                    )
+            if type_ == 'extra_vars':
+                validate_extra_vars(None, injector)
+            else:
+                for key, tmpl in injector.items():
+                    validate_template_string(type_, key, tmpl)
 
 
 class AskForField(models.BooleanField):

awx/main/management/commands/check_db.py

@@ -9,7 +9,6 @@ class Command(BaseCommand):
     """Checks connection to the database, and prints out connection info if not connected"""
 
     def handle(self, *args, **options):
-
         with connection.cursor() as cursor:
             cursor.execute("SELECT version()")
             version = str(cursor.fetchone()[0])

awx/main/management/commands/cleanup_jobs.py

@@ -82,7 +82,6 @@ class DeleteMeta:
         part_drop = {}
 
         for pk, status, created in self.jobs_qs:
-
             part_key = partition_table_name(self.job_class, created)
             if status in ['pending', 'waiting', 'running']:
                 part_drop[part_key] = False

awx/main/management/commands/create_oauth2_token.py

@@ -17,7 +17,6 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         if not options['user']:
-
             raise CommandError('Username not supplied. Usage: awx-manage create_oauth2_token --user=username.')
         try:
             user = User.objects.get(username=options['user'])

awx/main/management/commands/export_custom_scripts.py

@@ -10,7 +10,6 @@ from django.utils.text import slugify
 
 
 class Command(BaseCommand):
-
     help = 'Export custom inventory scripts into a tarfile.'
 
     def add_arguments(self, parser):
@@ -21,7 +20,6 @@ class Command(BaseCommand):
 
         with tempfile.TemporaryDirectory() as tmpdirname:
             with tarfile.open(tar_filename, "w") as tar:
-
                 for cis in CustomInventoryScript.objects.all():
                     # naming convention similar to project paths
                     slug_name = slugify(str(cis.name)).replace(u'-', u'_')

awx/main/management/commands/host_metric.py

@@ -6,7 +6,6 @@ import json
 
 
 class Command(BaseCommand):
-
     help = 'This is for offline licensing usage'
 
     def add_arguments(self, parser):

awx/main/management/commands/inventory_import.py

@@ -934,7 +934,6 @@ class Command(BaseCommand):
         # (even though inventory_import.Command.handle -- which calls
         # perform_update -- has its own lock, inventory_ID_import)
         with advisory_lock('inventory_{}_perform_update'.format(self.inventory.id)):
-
             try:
                 self.check_license()
             except PermissionDenied as e:

awx/main/management/commands/list_instances.py

@@ -6,7 +6,6 @@ from django.core.management.base import BaseCommand
 
 
 class Ungrouped(object):
-
     name = 'ungrouped'
     policy_instance_percentage = None
     policy_instance_minimum = None

awx/main/management/commands/remove_from_queue.py

@@ -7,7 +7,6 @@ from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):
-
     help = (
         "Remove an instance (specified by --hostname) from the specified queue (instance group).\n"
         "In order remove the queue, use the `unregister_queue` command."

awx/main/management/commands/replay_job_events.py

@@ -28,7 +28,6 @@ class JobStatusLifeCycle:
 
 
 class ReplayJobEvents(JobStatusLifeCycle):
-
     recording_start = None
     replay_start = None
 
@@ -190,7 +189,6 @@ class ReplayJobEvents(JobStatusLifeCycle):
 
 
 class Command(BaseCommand):
-
     help = 'Replay job events over websockets ordered by created on date.'
 
     def _parse_slice_range(self, slice_arg):

awx/main/management/commands/setup_managed_credential_types.py

@@ -7,7 +7,6 @@ from awx.main.models import CredentialType
 
 
 class Command(BaseCommand):
-
     help = 'Load default managed credential types.'
 
     def handle(self, *args, **options):

awx/main/management/commands/unregister_queue.py

@@ -10,7 +10,6 @@ from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):
-
     help = (
         "Remove specified queue (instance group) from database.\n"
         "Instances inside of queue will continue to exist, \n"

awx/main/middleware.py

@@ -38,7 +38,6 @@ class SettingsCacheMiddleware(MiddlewareMixin):
 
 
 class TimingMiddleware(threading.local, MiddlewareMixin):
-
     dest = '/var/log/tower/profile'
 
     def __init__(self, *args, **kwargs):

awx/main/migrations/0001_initial.py

@@ -14,7 +14,6 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('taggit', '0002_auto_20150616_2121'),
         ('contenttypes', '0002_remove_content_type_name'),

awx/main/migrations/0004_squashed_v310_release.py

@@ -12,7 +12,6 @@ from ._squashed_30 import SQUASHED_30
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0003_squashed_v300_v303_updates'),
     ]

awx/main/migrations/0005_squashed_v310_v313_updates.py

@@ -7,7 +7,6 @@ from ._squashed_31 import SQUASHED_31
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0004_squashed_v310_release'),
     ]

awx/main/migrations/0006_v320_release.py

@@ -26,7 +26,6 @@ def replaces():
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0005_squashed_v310_v313_updates'),
     ]

awx/main/migrations/0007_v320_data_migrations.py

@@ -7,7 +7,6 @@ from awx.main.migrations import ActivityStreamDisabledMigration
 
 
 class Migration(ActivityStreamDisabledMigration):
-
     dependencies = [
         ('main', '0006_v320_release'),
     ]

awx/main/migrations/0008_v320_drop_v1_credential_fields.py

@@ -11,7 +11,6 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0007_v320_data_migrations'),
     ]

awx/main/migrations/0009_v322_add_setting_field_for_activity_stream.py

@@ -7,7 +7,6 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0008_v320_drop_v1_credential_fields'),
     ]

awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0009_v322_add_setting_field_for_activity_stream'),
     ]

awx/main/migrations/0011_v322_encrypt_survey_passwords.py

@@ -5,7 +5,6 @@ from awx.main.migrations import ActivityStreamDisabledMigration
 
 
 class Migration(ActivityStreamDisabledMigration):
-
     dependencies = [
         ('main', '0010_v322_add_ovirt4_tower_inventory'),
     ]

awx/main/migrations/0012_v322_update_cred_types.py

@@ -5,7 +5,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0011_v322_encrypt_survey_passwords'),
     ]

awx/main/migrations/0013_v330_multi_credential.py

@@ -9,7 +9,6 @@ from awx.main.migrations._multi_cred import migrate_to_multi_cred, migrate_back_
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0012_v322_update_cred_types'),
     ]

awx/main/migrations/0014_v330_saved_launchtime_configs.py

@@ -11,7 +11,6 @@ from awx.main.migrations._scan_jobs import remove_scan_type_nodes
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0013_v330_multi_credential'),
     ]

awx/main/migrations/0015_v330_blank_start_args.py

@@ -7,7 +7,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0014_v330_saved_launchtime_configs'),
     ]

awx/main/migrations/0016_v330_non_blank_workflow.py

@@ -7,7 +7,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0015_v330_blank_start_args'),
     ]

awx/main/migrations/0017_v330_move_deprecated_stdout.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0016_v330_non_blank_workflow'),
     ]

awx/main/migrations/0018_v330_add_additional_stdout_events.py

@@ -9,7 +9,6 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0017_v330_move_deprecated_stdout'),
     ]

awx/main/migrations/0019_v330_custom_virtualenv.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0018_v330_add_additional_stdout_events'),
     ]

awx/main/migrations/0020_v330_instancegroup_policies.py

@@ -8,7 +8,6 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0019_v330_custom_virtualenv'),
     ]

awx/main/migrations/0021_v330_declare_new_rbac_roles.py

@@ -8,7 +8,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0020_v330_instancegroup_policies'),
     ]

awx/main/migrations/0022_v330_create_new_rbac_roles.py

@@ -8,7 +8,6 @@ from awx.main.migrations import _migration_utils as migration_utils
 
 
 class Migration(ActivityStreamDisabledMigration):
-
     dependencies = [
         ('main', '0021_v330_declare_new_rbac_roles'),
     ]

awx/main/migrations/0023_v330_inventory_multicred.py

@@ -9,7 +9,6 @@ from awx.main.migrations._multi_cred import migrate_inventory_source_cred, migra
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0022_v330_create_new_rbac_roles'),
     ]

awx/main/migrations/0024_v330_create_user_session_membership.py

@@ -8,7 +8,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('sessions', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),

awx/main/migrations/0025_v330_add_oauth_activity_stream_registrar.py

@@ -10,7 +10,6 @@ import re
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0024_v330_create_user_session_membership'),
     ]

awx/main/migrations/0026_v330_delete_authtoken.py

@@ -8,7 +8,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0025_v330_add_oauth_activity_stream_registrar'),
     ]

awx/main/migrations/0027_v330_emitted_events.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0026_v330_delete_authtoken'),
     ]

awx/main/migrations/0028_v330_add_tower_verify.py

@@ -8,7 +8,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0027_v330_emitted_events'),
     ]

awx/main/migrations/0030_v330_modify_application.py

@@ -7,7 +7,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0028_v330_add_tower_verify'),
     ]

awx/main/migrations/0031_v330_encrypt_oauth2_secret.py

@@ -8,7 +8,6 @@ import oauth2_provider.generators
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0030_v330_modify_application'),
     ]

awx/main/migrations/0032_v330_polymorphic_delete.py

@@ -7,7 +7,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0031_v330_encrypt_oauth2_secret'),
     ]

awx/main/migrations/0033_v330_oauth_help_text.py

@@ -12,7 +12,6 @@ import oauth2_provider.generators
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0032_v330_polymorphic_delete'),
     ]

awx/main/migrations/0034_v330_delete_user_role.py

@@ -10,7 +10,6 @@ from awx.main.migrations import _migration_utils as migration_utils
 
 
 class Migration(ActivityStreamDisabledMigration):
-
     dependencies = [
         ('main', '0033_v330_oauth_help_text'),
     ]

awx/main/migrations/0035_v330_more_oauth2_help_text.py

@@ -8,7 +8,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0034_v330_delete_user_role'),
     ]

awx/main/migrations/0036_v330_credtype_remove_become_methods.py

@@ -8,7 +8,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0035_v330_more_oauth2_help_text'),
     ]

awx/main/migrations/0037_v330_remove_legacy_fact_cleanup.py

@@ -8,7 +8,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0036_v330_credtype_remove_become_methods'),
     ]

awx/main/migrations/0038_v330_add_deleted_activitystream_actor.py

@@ -8,7 +8,6 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0037_v330_remove_legacy_fact_cleanup'),
     ]

awx/main/migrations/0039_v330_custom_venv_help_text.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0038_v330_add_deleted_activitystream_actor'),
     ]

awx/main/migrations/0040_v330_unifiedjob_controller_node.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0039_v330_custom_venv_help_text'),
     ]

awx/main/migrations/0041_v330_update_oauth_refreshtoken.py

@@ -8,7 +8,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL),
         ('main', '0040_v330_unifiedjob_controller_node'),

awx/main/migrations/0042_v330_org_member_role_deparent.py

@@ -9,7 +9,6 @@ from awx.main.migrations._rbac import rebuild_role_hierarchy
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0041_v330_update_oauth_refreshtoken'),
     ]

awx/main/migrations/0043_v330_oauth2accesstoken_modified.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0042_v330_org_member_role_deparent'),
     ]

awx/main/migrations/0044_v330_add_inventory_update_inventory.py

@@ -7,7 +7,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0043_v330_oauth2accesstoken_modified'),
     ]

awx/main/migrations/0045_v330_instance_managed_by_policy.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0044_v330_add_inventory_update_inventory'),
     ]

awx/main/migrations/0046_v330_remove_client_credentials_grant.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0045_v330_instance_managed_by_policy'),
     ]

awx/main/migrations/0047_v330_activitystream_instance.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0046_v330_remove_client_credentials_grant'),
     ]

awx/main/migrations/0048_v330_django_created_modified_by_model_name.py

@@ -8,7 +8,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0047_v330_activitystream_instance'),
     ]

awx/main/migrations/0049_v330_validate_instance_capacity_adjustment.py

@@ -8,7 +8,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0048_v330_django_created_modified_by_model_name'),
     ]

awx/main/migrations/0050_v340_drop_celery_tables.py

@@ -5,7 +5,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0049_v330_validate_instance_capacity_adjustment'),
     ]

awx/main/migrations/0051_v340_job_slicing.py

@@ -8,7 +8,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0050_v340_drop_celery_tables'),
     ]

awx/main/migrations/0052_v340_remove_project_scm_delete_on_next_update.py

@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0051_v340_job_slicing'),
     ]

awx/main/migrations/0053_v340_workflow_inventory.py

@@ -9,7 +9,6 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0052_v340_remove_project_scm_delete_on_next_update'),
     ]

awx/main/migrations/0054_v340_workflow_convergence.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0053_v340_workflow_inventory'),
     ]

awx/main/migrations/0055_v340_add_grafana_notification.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0054_v340_workflow_convergence'),
     ]

awx/main/migrations/0056_v350_custom_venv_history.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0055_v340_add_grafana_notification'),
     ]

awx/main/migrations/0057_v350_remove_become_method_type.py

@@ -9,7 +9,6 @@ from awx.main.migrations import _credentialtypes as credentialtypes
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0056_v350_custom_venv_history'),
     ]

awx/main/migrations/0058_v350_remove_limit_limit.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0057_v350_remove_become_method_type'),
     ]

awx/main/migrations/0059_v350_remove_adhoc_limit.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0058_v350_remove_limit_limit'),
     ]

awx/main/migrations/0060_v350_update_schedule_uniqueness_constraint.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0059_v350_remove_adhoc_limit'),
     ]

awx/main/migrations/0061_v350_track_native_credentialtype_source.py

@@ -14,7 +14,6 @@ def migrate_to_static_inputs(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0060_v350_update_schedule_uniqueness_constraint'),
     ]

awx/main/migrations/0062_v350_new_playbook_stats.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0061_v350_track_native_credentialtype_source'),
     ]

awx/main/migrations/0063_v350_org_host_limits.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0062_v350_new_playbook_stats'),
     ]

awx/main/migrations/0064_v350_analytics_state.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0063_v350_org_host_limits'),
     ]

awx/main/migrations/0065_v350_index_job_status.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0064_v350_analytics_state'),
     ]

awx/main/migrations/0066_v350_inventorysource_custom_virtualenv.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0065_v350_index_job_status'),
     ]

awx/main/migrations/0067_v350_credential_plugins.py

@@ -18,7 +18,6 @@ def setup_tower_managed_defaults(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('taggit', '0002_auto_20150616_2121'),

awx/main/migrations/0068_v350_index_event_created.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0067_v350_credential_plugins'),
     ]

awx/main/migrations/0069_v350_generate_unique_install_uuid.py

@@ -18,7 +18,6 @@ def _gen_install_uuid(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0068_v350_index_event_created'),
     ]

awx/main/migrations/0070_v350_gce_instance_id.py

@@ -25,7 +25,6 @@ def gce_id_backward(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0069_v350_generate_unique_install_uuid'),
     ]

awx/main/migrations/0071_v350_remove_system_tracking.py

@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0070_v350_gce_instance_id'),
     ]

awx/main/migrations/0072_v350_deprecate_fields.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0071_v350_remove_system_tracking'),
     ]

awx/main/migrations/0073_v360_create_instance_group_m2m.py

@@ -7,7 +7,6 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0072_v350_deprecate_fields'),
     ]

awx/main/migrations/0074_v360_migrate_instance_group_relations.py

@@ -28,7 +28,6 @@ def create_through_relations(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0073_v360_create_instance_group_m2m'),
     ]

awx/main/migrations/0075_v360_remove_old_instance_group_relations.py

@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0074_v360_migrate_instance_group_relations'),
     ]

awx/main/migrations/0076_v360_add_new_instance_group_relations.py

@@ -7,7 +7,6 @@ from awx.main.fields import OrderedManyToManyField
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0075_v360_remove_old_instance_group_relations'),
     ]

awx/main/migrations/0077_v360_add_default_orderings.py

@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0076_v360_add_new_instance_group_relations'),
     ]

awx/main/migrations/0078_v360_clear_sessions_tokens_jt.py

@@ -7,7 +7,6 @@ from awx.main.migrations._create_system_jobs import create_clearsessions_jt, cre
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0077_v360_add_default_orderings'),
     ]

awx/main/migrations/0079_v360_rm_implicit_oauth2_apps.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0078_v360_clear_sessions_tokens_jt'),
     ]

awx/main/migrations/0080_v360_replace_job_origin.py

@@ -8,7 +8,6 @@ from awx.main.utils.common import set_current_apps
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0079_v360_rm_implicit_oauth2_apps'),
     ]

awx/main/migrations/0081_v360_notify_on_start.py

@@ -22,7 +22,6 @@ def forwards_split_organization_any(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0080_v360_replace_job_origin'),
     ]

awx/main/migrations/0082_v360_webhook_http_method.py

@@ -15,7 +15,6 @@ def add_webhook_notification_template_fields(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0081_v360_notify_on_start'),
     ]

awx/main/migrations/0083_v360_job_branch_override.py

@@ -7,7 +7,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0082_v360_webhook_http_method'),
     ]

awx/main/migrations/0084_v360_token_description.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0083_v360_job_branch_override'),
     ]