From 2be3a3b5122c446240627805d25dc70e8615ecc2 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Fri, 13 Dec 2019 01:10:18 +0100
Subject: [PATCH] [Reformat] RUn isort over source tree
---
biscuit/core/admin.py | 1 -
biscuit/core/cronjobs.py | 1 +
biscuit/core/decorators.py | 1 +
biscuit/core/forms.py | 3 ++-
biscuit/core/migrations/0001_initial.py | 3 ++-
biscuit/core/migrations/0002_school_term.py | 2 +-
biscuit/core/migrations/0003_school_logo.py | 1 +
biscuit/core/settings.py | 2 +-
biscuit/core/signals.py | 2 +-
biscuit/core/tests/browser/test_selenium.py | 4 ++--
biscuit/core/tests/views/test_account.py | 4 ++--
biscuit/core/urls.py | 2 +-
biscuit/core/util/core_helpers.py | 2 +-
biscuit/core/views.py | 17 ++++++-----------
14 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/biscuit/core/admin.py b/biscuit/core/admin.py
index 0810d4504..106da0677 100644
--- a/biscuit/core/admin.py
+++ b/biscuit/core/admin.py
@@ -2,7 +2,6 @@ from django.contrib import admin
from .models import Group, Person, School, SchoolTerm
-
admin.site.register(Person)
admin.site.register(Group)
admin.site.register(School)
diff --git a/biscuit/core/cronjobs.py b/biscuit/core/cronjobs.py
index 66e6c069c..2ffe250b7 100644
--- a/biscuit/core/cronjobs.py
+++ b/biscuit/core/cronjobs.py
@@ -1,5 +1,6 @@
from django.conf import settings
from django.core import management
+
from django_cron import CronJobBase, Schedule
diff --git a/biscuit/core/decorators.py b/biscuit/core/decorators.py
index 7c0feb30e..bd87884fb 100644
--- a/biscuit/core/decorators.py
+++ b/biscuit/core/decorators.py
@@ -1,4 +1,5 @@
from typing import Callable
+
from django.contrib.auth.decorators import user_passes_test
diff --git a/biscuit/core/forms.py b/biscuit/core/forms.py
index e032df5f7..cef045d86 100644
--- a/biscuit/core/forms.py
+++ b/biscuit/core/forms.py
@@ -1,9 +1,10 @@
from django import forms
from django.contrib.auth import get_user_model
from django.utils.translation import ugettext_lazy as _
+
from django_select2.forms import ModelSelect2MultipleWidget, Select2Widget
-from .models import Person, Group, School, SchoolTerm
+from .models import Group, Person, School, SchoolTerm
class PersonAccountForm(forms.ModelForm):
diff --git a/biscuit/core/migrations/0001_initial.py b/biscuit/core/migrations/0001_initial.py
index 1a88ae010..36a2f4cbe 100644
--- a/biscuit/core/migrations/0001_initial.py
+++ b/biscuit/core/migrations/0001_initial.py
@@ -1,9 +1,10 @@
# Generated by Django 2.2.5 on 2019-09-03 18:30
+import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
from django.utils.translation import ugettext_lazy as _
-import django.db.models.deletion
+
import image_cropping.fields
import phonenumber_field.modelfields
diff --git a/biscuit/core/migrations/0002_school_term.py b/biscuit/core/migrations/0002_school_term.py
index 026d7e3a5..8b1923f5c 100644
--- a/biscuit/core/migrations/0002_school_term.py
+++ b/biscuit/core/migrations/0002_school_term.py
@@ -1,7 +1,7 @@
# Generated by Django 2.2.5 on 2019-09-14 12:55
-from django.db import migrations, models
import django.db.models.deletion
+from django.db import migrations, models
from django.utils.translation import ugettext_lazy as _
diff --git a/biscuit/core/migrations/0003_school_logo.py b/biscuit/core/migrations/0003_school_logo.py
index c855202b5..09a18d44e 100644
--- a/biscuit/core/migrations/0003_school_logo.py
+++ b/biscuit/core/migrations/0003_school_logo.py
@@ -1,6 +1,7 @@
# Generated by Django 2.2.5 on 2019-09-14 13:03
from django.db import migrations
+
import image_cropping.fields
diff --git a/biscuit/core/settings.py b/biscuit/core/settings.py
index b265e7de3..1d88877f2 100644
--- a/biscuit/core/settings.py
+++ b/biscuit/core/settings.py
@@ -1,6 +1,6 @@
-from glob import glob
import os
import sys
+from glob import glob
from django.utils.translation import ugettext_lazy as _
diff --git a/biscuit/core/signals.py b/biscuit/core/signals.py
index 2a2e34198..bcd55fe62 100644
--- a/biscuit/core/signals.py
+++ b/biscuit/core/signals.py
@@ -1,5 +1,5 @@
-from glob import glob
import os
+from glob import glob
from django.conf import settings
diff --git a/biscuit/core/tests/browser/test_selenium.py b/biscuit/core/tests/browser/test_selenium.py
index 795e23799..0ff3d2cf9 100644
--- a/biscuit/core/tests/browser/test_selenium.py
+++ b/biscuit/core/tests/browser/test_selenium.py
@@ -1,11 +1,11 @@
import os
-import pytest
-
from django.conf import settings
from django.test.selenium import SeleniumTestCase, SeleniumTestCaseBase
from django.urls import reverse
+import pytest
+
SeleniumTestCaseBase.external_host = os.environ.get("TEST_HOST", "") or None
SeleniumTestCaseBase.browsers = list(
filter(bool, os.environ.get("TEST_SELENIUM_BROWSERS", "").split(","))
diff --git a/biscuit/core/tests/views/test_account.py b/biscuit/core/tests/views/test_account.py
index 16016665f..2e4e7fb3c 100644
--- a/biscuit/core/tests/views/test_account.py
+++ b/biscuit/core/tests/views/test_account.py
@@ -1,8 +1,8 @@
-import pytest
-
from django.conf import settings
from django.urls import reverse
+import pytest
+
@pytest.mark.django_db
def test_index_not_logged_in(client):
diff --git a/biscuit/core/urls.py b/biscuit/core/urls.py
index 470f5471d..1654982eb 100644
--- a/biscuit/core/urls.py
+++ b/biscuit/core/urls.py
@@ -1,7 +1,7 @@
from django.apps import apps
-from django.contrib import admin
from django.conf import settings
from django.conf.urls.static import static
+from django.contrib import admin
from django.contrib.auth import views as auth_views
from django.urls import include, path
diff --git a/biscuit/core/util/core_helpers.py b/biscuit/core/util/core_helpers.py
index d66eb3a53..232890ce4 100644
--- a/biscuit/core/util/core_helpers.py
+++ b/biscuit/core/util/core_helpers.py
@@ -1,5 +1,5 @@
-from importlib import import_module
import pkgutil
+from importlib import import_module
from typing import Sequence
from django.conf import settings
diff --git a/biscuit/core/views.py b/biscuit/core/views.py
index 999f911d3..309ea1672 100644
--- a/biscuit/core/views.py
+++ b/biscuit/core/views.py
@@ -2,22 +2,17 @@ from typing import Optional
from django.contrib.auth.decorators import login_required
from django.http import Http404, HttpRequest, HttpResponse
-from django.shortcuts import get_object_or_404, render, redirect
-from django_tables2 import RequestConfig
+from django.shortcuts import get_object_or_404, redirect, render
from django.utils.translation import ugettext_lazy as _
from django_cron.models import CronJobLog
+from django_tables2 import RequestConfig
from .decorators import admin_required
-from .forms import (
- PersonsAccountsFormSet,
- EditPersonForm,
- EditGroupForm,
- EditSchoolForm,
- EditTermForm,
-)
-from .models import Person, Group, School
-from .tables import PersonsTable, GroupsTable
+from .forms import (EditGroupForm, EditPersonForm, EditSchoolForm, EditTermForm,
+ PersonsAccountsFormSet)
+from .models import Group, Person, School
+from .tables import GroupsTable, PersonsTable
from .util import messages
--
GitLab