Fix import order and variable names (#960)

app/config/__init__.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 
-from .celery import app as celery_app
+from config.celery import app as celery_app
 
 __all__ = ["celery_app"]
 

app/grandchallenge/admins/views.py

@@ -1,7 +1,7 @@
 from dal import autocomplete
 from django.contrib.auth import get_user_model
 from django.contrib.messages.views import SuccessMessageMixin
-from django.views.generic import ListView, FormView
+from django.views.generic import FormView, ListView
 
 from grandchallenge.admins.forms import AdminsForm
 from grandchallenge.core.permissions.mixins import UserIsChallengeAdminMixin

app/grandchallenge/algorithms/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from grandchallenge.algorithms.models import (
     Algorithm,
     AlgorithmImage,

app/grandchallenge/algorithms/forms.py

@@ -4,16 +4,16 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.forms import (
-    ModelForm,
-    Form,
-    ModelChoiceField,
     ChoiceField,
+    Form,
     HiddenInput,
+    ModelChoiceField,
+    ModelForm,
 )
 from guardian.shortcuts import get_objects_for_user
 from guardian.utils import get_anonymous_user
 
-from grandchallenge.algorithms.models import AlgorithmImage, Algorithm
+from grandchallenge.algorithms.models import Algorithm, AlgorithmImage
 from grandchallenge.core.forms import SaveFormInitMixin
 from grandchallenge.core.validators import ExtensionValidator
 from grandchallenge.jqfileupload.widgets import uploader

app/grandchallenge/algorithms/migrations/0001_squashed_0004_auto_20180814_1508.py

@@ -1,13 +1,15 @@
 # Generated by Django 2.0.8 on 2018-08-14 15:24
 
-from django.conf import settings
+import uuid
+
 import django.contrib.postgres.fields.jsonb
-from django.db import migrations, models
 import django.db.models.deletion
+import social_django.fields
+from django.conf import settings
+from django.db import migrations, models
+
 import grandchallenge.container_exec.models
 import grandchallenge.core.validators
-import social_django.fields
-import uuid
 
 
 class Migration(migrations.Migration):

app/grandchallenge/algorithms/migrations/0004_auto_20181108_1224.py

@@ -1,6 +1,7 @@
 # Generated by Django 2.1.2 on 2018-11-08 12:24
 
 from django.db import migrations, models
+
 import grandchallenge.container_exec.models
 import grandchallenge.core.validators
 

app/grandchallenge/algorithms/migrations/0005_auto_20181123_1523.py

@@ -1,6 +1,7 @@
 # Generated by Django 2.1.3 on 2018-11-23 15:23
 
 from decimal import Decimal
+
 from django.db import migrations, models
 
 

app/grandchallenge/algorithms/migrations/0006_auto_20181205_2226.py

@@ -1,6 +1,7 @@
 # Generated by Django 2.1.4 on 2018-12-05 22:26
 
 from django.db import migrations, models
+
 import grandchallenge.container_exec.models
 import grandchallenge.core.validators
 

app/grandchallenge/algorithms/migrations/0007_auto_20190215_1328.py

@@ -1,6 +1,7 @@
 # Generated by Django 2.1.7 on 2019-02-15 13:28
 
 from django.db import migrations, models
+
 import grandchallenge.container_exec.models
 import grandchallenge.core.storage
 import grandchallenge.core.validators

app/grandchallenge/algorithms/migrations/0008_auto_20190508_1325.py

@@ -1,7 +1,8 @@
 # Generated by Django 2.1.8 on 2019-05-08 13:25
 
-from django.db import migrations, models
 import django_extensions.db.fields
+from django.db import migrations, models
+
 import grandchallenge.challenges.models
 
 

app/grandchallenge/algorithms/migrations/0009_auto_20190826_0951.py

@@ -1,8 +1,8 @@
 # Generated by Django 2.2.4 on 2019-08-26 09:51
 
+import django_extensions.db.fields
 from django.conf import settings
 from django.db import migrations
-import django_extensions.db.fields
 
 
 class Migration(migrations.Migration):

app/grandchallenge/algorithms/migrations/0010_auto_20190827_1159.py

@@ -1,10 +1,12 @@
 # Generated by Django 2.2.4 on 2019-08-27 11:59
 
-from django.db import migrations, models
+import uuid
+
 import django.db.models.deletion
 import django_extensions.db.fields
+from django.db import migrations, models
+
 import grandchallenge.challenges.models
-import uuid
 
 
 class Migration(migrations.Migration):

app/grandchallenge/algorithms/migrations/0011_algorithm_image_data_20190827_1236.py

@@ -6,8 +6,10 @@
 
 def algorithm_container_images_to_algorithms_reverse(apps, schema_editor):
     # Reverse, create AlgorithmImage from Algorithm
-    Algorithm = apps.get_model("algorithms", "Algorithm")
-    AlgorithmImage = apps.get_model("algorithms", "AlgorithmImage")
+    Algorithm = apps.get_model("algorithms", "Algorithm")  # noqa: N806
+    AlgorithmImage = apps.get_model(  # noqa: N806
+        "algorithms", "AlgorithmImage"
+    )
 
     for a in Algorithm.objects.all():
         for im in a.algorithm_container_images.all():
@@ -25,8 +27,8 @@ def algorithm_container_images_to_algorithms_reverse(apps, schema_editor):
 
 
 def create_algorithm_workstation(apps):
-    Group = apps.get_model("auth", "Group")
-    Workstation = apps.get_model("workstations", "Workstation")
+    Group = apps.get_model("auth", "Group")  # noqa: N806
+    Workstation = apps.get_model("workstations", "Workstation")  # noqa: N806
 
     pk = uuid4()
     editors_group = Group.objects.create(
@@ -49,9 +51,11 @@ def create_algorithm_workstation(apps):
 def algorithm_container_images_to_algorithms_forward(apps, schema_editor):
     # Forward, create Algorithm from AlgorithmImage
 
-    Algorithm = apps.get_model("algorithms", "Algorithm")
-    AlgorithmImage = apps.get_model("algorithms", "AlgorithmImage")
-    Group = apps.get_model("auth", "Group")
+    Algorithm = apps.get_model("algorithms", "Algorithm")  # noqa: N806
+    AlgorithmImage = apps.get_model(  # noqa: N806
+        "algorithms", "AlgorithmImage"
+    )
+    Group = apps.get_model("auth", "Group")  # noqa: N806
 
     workstation = create_algorithm_workstation(apps)
 

app/grandchallenge/algorithms/migrations/0012_auto_20191007_1222.py

@@ -1,8 +1,8 @@
 # Generated by Django 2.2.6 on 2019-10-07 12:22
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

app/grandchallenge/algorithms/migrations/0014_algorithm_workstation_config.py

@@ -1,7 +1,7 @@
 # Generated by Django 2.2.6 on 2019-10-15 10:05
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

app/grandchallenge/algorithms/models.py

@@ -15,7 +15,7 @@
 from django_extensions.db.models import TitleSlugDescriptionModel
 from guardian.shortcuts import assign_perm, get_objects_for_group, remove_perm
 
-from grandchallenge.cases.models import RawImageUploadSession, RawImageFile
+from grandchallenge.cases.models import RawImageFile, RawImageUploadSession
 from grandchallenge.challenges.models import get_logo_path
 from grandchallenge.container_exec.backends.docker import (
     Executor,

app/grandchallenge/algorithms/serializers.py

@@ -3,10 +3,10 @@
 from rest_framework.relations import HyperlinkedRelatedField
 
 from grandchallenge.algorithms.models import (
+    Algorithm,
     AlgorithmImage,
     Job,
     Result,
-    Algorithm,
 )
 from grandchallenge.cases.models import Image
 

app/grandchallenge/algorithms/urls.py

@@ -1,15 +1,15 @@
 from django.urls import path
 
 from grandchallenge.algorithms.views import (
+    AlgorithmCreate,
+    AlgorithmDetail,
+    AlgorithmExecutionSessionCreate,
     AlgorithmImageCreate,
     AlgorithmImageDetail,
-    AlgorithmExecutionSessionCreate,
-    AlgorithmList,
-    AlgorithmDetail,
-    AlgorithmCreate,
-    AlgorithmUpdate,
     AlgorithmImageUpdate,
     AlgorithmJobsList,
+    AlgorithmList,
+    AlgorithmUpdate,
     AlgorithmUserAutocomplete,
     EditorsUpdate,
     UsersUpdate,

app/grandchallenge/algorithms/views.py

@@ -12,9 +12,9 @@
 from django.views.generic import (
     CreateView,
     DetailView,
+    FormView,
     ListView,
     UpdateView,
-    FormView,
 )
 from guardian.mixins import (
     LoginRequiredMixin,
@@ -26,23 +26,23 @@
 from rest_framework_guardian.filters import ObjectPermissionsFilter
 
 from grandchallenge.algorithms.forms import (
-    AlgorithmImageForm,
     AlgorithmForm,
+    AlgorithmImageForm,
     AlgorithmImageUpdateForm,
     EditorsForm,
     UsersForm,
 )
 from grandchallenge.algorithms.models import (
+    Algorithm,
     AlgorithmImage,
     Job,
     Result,
-    Algorithm,
 )
 from grandchallenge.algorithms.serializers import (
     AlgorithmImageSerializer,
-    ResultSerializer,
-    JobSerializer,
     AlgorithmSerializer,
+    JobSerializer,
+    ResultSerializer,
 )
 from grandchallenge.cases.forms import UploadRawImagesForm
 from grandchallenge.cases.models import RawImageUploadSession

app/grandchallenge/annotations/admin.py

@@ -1,12 +1,13 @@
 from django.contrib import admin
-from .models import (
+
+from grandchallenge.annotations.models import (
+    BooleanClassificationAnnotation,
     ETDRSGridAnnotation,
+    LandmarkAnnotationSet,
     MeasurementAnnotation,
-    BooleanClassificationAnnotation,
     PolygonAnnotationSet,
-    SinglePolygonAnnotation,
-    LandmarkAnnotationSet,
     SingleLandmarkAnnotation,
+    SinglePolygonAnnotation,
 )
 
 

app/grandchallenge/annotations/management/commands/copyannotations.py

@@ -1,16 +1,16 @@
-from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.management.base import BaseCommand, CommandError
 from guardian.shortcuts import assign_perm
 
 from grandchallenge.annotations.models import (
-    MeasurementAnnotation,
     BooleanClassificationAnnotation,
+    CoordinateListAnnotation,
+    ETDRSGridAnnotation,
     IntegerClassificationAnnotation,
-    PolygonAnnotationSet,
     LandmarkAnnotationSet,
-    ETDRSGridAnnotation,
-    CoordinateListAnnotation,
+    MeasurementAnnotation,
+    PolygonAnnotationSet,
 )
 
 

app/grandchallenge/annotations/migrations/0001_initial.py

@@ -1,11 +1,11 @@
 # Generated by Django 2.1.5 on 2019-02-04 15:17
 
-from django.conf import settings
+import uuid
+
 import django.contrib.postgres.fields
-from django.db import migrations, models
-import django.db.models.deletion
 import django.utils.timezone
-import uuid
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

app/grandchallenge/annotations/migrations/0003_auto_20190603_1208.py

@@ -2,6 +2,7 @@
 
 import django.contrib.postgres.fields
 from django.db import migrations, models
+
 import grandchallenge.annotations.models
 
 

app/grandchallenge/annotations/migrations/0004_imagepathologyannotation_imagequalityannotation_retinaimagepathologyannotation.py

@@ -1,10 +1,10 @@
 # Generated by Django 2.2.2 on 2019-06-07 12:59
 
+import uuid
+
+import django.utils.timezone
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-import uuid
 
 
 class Migration(migrations.Migration):

app/grandchallenge/annotations/migrations/0005_imagetextannotation.py

@@ -1,10 +1,10 @@
 # Generated by Django 2.2.2 on 2019-07-11 10:35
 
+import uuid
+
+import django.utils.timezone
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-import uuid
 
 
 class Migration(migrations.Migration):

app/grandchallenge/annotations/models.py

@@ -1,13 +1,14 @@
-from django.db import models
-from django.contrib.postgres.fields import ArrayField
-from django.utils import timezone
-from grandchallenge.core.models import UUIDModel
-from grandchallenge.cases.models import Image
+from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
-from django.conf import settings
+from django.contrib.postgres.fields import ArrayField
+from django.db import models
+from django.utils import timezone
 from guardian.shortcuts import assign_perm
 
+from grandchallenge.cases.models import Image
+from grandchallenge.core.models import UUIDModel
+
 
 class AbstractAnnotationModel(UUIDModel):
     """