diff --git a/biscuit/core/admin.py b/biscuit/core/admin.py index 0810d4504654e0e1337c70810c41696d6e2abbd0..106da0677831f722aefa1d28d23dde9fea838b06 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 66e6c069c90ac6047ce3d10b867d1297a84ac61d..2ffe250b7939061afddf6246a8309fcc8a3e0feb 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 7c0feb30ef05ea88431bc41ef210ceecd1003921..bd87884fbdace4a4277e9d81503a89c89924563d 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 e032df5f7a53febfa5ef3b2222390a9f11f5d83f..cef045d867bd838acc8443c17eb695a48e90b31a 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 1a88ae010c8497c6e432931ec15438feda3e0aa1..36a2f4cbe4c667ee3cf89efa29232b83293259b4 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 026d7e3a518fe4a4d299ca01500605afbdced4ca..8b1923f5c7ee263eca740493051fb714b57de48e 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 c855202b5e08e69df3ee133ed5fdc5046acf80d1..09a18d44e827a32f25774867092de3ac35f3a014 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 b265e7de3903140c7f004b04eac8ccd7048da200..1d88877f2d8ae53a2cdf57d6a4979f1abb082be7 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 2a2e34198624d4cd7c8e1f3c08869d787e1b8483..bcd55fe623bc3f3952a0853e8f8688630978194a 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 795e23799320d1d7c2897bf6539f2e82af7427cb..0ff3d2cf9ea20be4b2f3a3466385393cd2d63284 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 16016665f4a39daa249ca7c211f5bd01aa07a3c0..2e4e7fb3cf748e3857baea4b3ea1ca2cffd03db8 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 470f5471d988b0facd52882404ae394e79bba134..1654982eb007266be149bdbfceb119aa177fdea9 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 d66eb3a53bc9bcf2565664deaccc1436888428bb..232890ce4e1789204d8d6c30ed7638ee2499b73c 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 999f911d3eabd0171e71af83372128c0236135b3..309ea1672741fba528248a5e5b323e9911b8824e 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