Add pre-commit hooks and lint codebase to match

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+-   repo: git://github.com/pre-commit/pre-commit-hooks
+    sha: 97b88d9610bcc03982ddac33caba98bb2b751f5f
+    hooks:
+    -   id: trailing-whitespace
+    -   id: flake8
+        args:
+        - --exclude=*/*migrations/*, testproject/testproject/settings/*
+    -   id: check-added-large-files
+    -   id: debug-statements
+    -   id: end-of-file-fixer
+-   repo: git://github.com/FalconSocial/pre-commit-python-sorter
+    sha: d044ff27300a6dc8b1a56cd22552e3a810dc6f49
+    hooks:
+    -   id: python-import-sorter
+        args:
+        - --silent-overwrite

docs/conf.py

@@ -13,8 +13,13 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
+
+import django
+import eggplant
+from django.db.models.fields.files import FileDescriptor
+from djmoney.models.fields import MoneyFieldProxy
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -29,16 +34,13 @@
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "eggplant_project.settings.docs")
 
-import django
 django.setup()
 
 
 # Hacks for the autodoc introspector
 
-from django.db.models.fields.files import FileDescriptor
 FileDescriptor.__get__ = lambda self, *args, **kwargs: self
 
-from djmoney.models.fields import MoneyFieldProxy
 MoneyFieldProxy.__get__ = lambda self, *args, **kwargs: self
 
 
@@ -79,7 +81,6 @@
 sys.path = [path] + sys.path
 sys.path = [os.path.join(path, 'dbbackup')] + sys.path
 
-import eggplant
 
 # General information about the project.
 project = 'Eggplant'

eggplant/accounts/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

eggplant/accounts/migrations/0002_account_department.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

eggplant/accounts/migrations/0003_account_user_profiles.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

eggplant/accounts/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

eggplant/accounts/urls.py

@@ -1,8 +1 @@
-from django.conf.urls import url
-
-from . import views
-
-
-urlpatterns = [
-
-]
+urlpatterns = []

eggplant/accounts/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

eggplant/core/static/css/eggplant.css

@@ -217,4 +217,4 @@ select.form-control.money-widget {
 .language-chooser ul.nav > li.active > a
 {
     background-color: rgb(138, 34, 98);
-}
+}

eggplant/core/tests.py

@@ -1,10 +1,9 @@
 from django.conf import settings
 from django.test import TestCase
-
+from django.test.client import RequestFactory
 from eggplant.core.utils import generate_upload_path
 
 from .context_processors import coop_vars
-from django.test.client import RequestFactory
 
 
 class UtilsTestCase(TestCase):

eggplant/core/utils.py

@@ -1,6 +1,6 @@
-from functools import wraps
 import os
 import uuid
+from functools import wraps
 
 from django.conf import settings
 from django.contrib.sites.models import Site
@@ -38,4 +38,4 @@ def wrapper(*args, **kwargs):
         if kwargs.get('raw'):
             return
         signal_handler(*args, **kwargs)
-    return wrapper
+    return wrapper

eggplant/dashboard/admin.py

@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.contrib import admin
-
-# Register your models here.

eggplant/dashboard/tests.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-from django.test import TestCase
-
 from django.core.urlresolvers import reverse
+from django.test import TestCase
 
 
 class TestDashboard(TestCase):

eggplant/dashboard/views.py

@@ -1,8 +1,7 @@
-from django.shortcuts import render
-from django.contrib.auth.decorators import login_required
-
 import logging
 
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render
 
 log = logging.getLogger(__file__)
 

eggplant/departments/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

eggplant/departments/migrations/0002_auto_20151027_1817.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

eggplant/departments/templates/eggplant/departments/department_form.html

@@ -1,4 +1,4 @@
 {% extends 'eggplant/departments/department_base.html' %}
 
 {% block department_content %}
-{% endblock %}
+{% endblock %}

eggplant/departments/templates/eggplant/departments/department_list.html

@@ -4,4 +4,4 @@
   {% for department in departments %}
     <a href="{% url 'eggplant:departments:detail' department.slug %}">{{ department.name }}</a><br />
   {% endfor %}
-{% endblock %}
+{% endblock %}

eggplant/departments/tests.py

@@ -1,8 +1,7 @@
 from django.test import TestCase
-
 # Create your tests here.
-from eggplant.factories import DepartmentFactory, UserFactory, \
-    DepartmentAdministratorFactory, AccountFactory
+from eggplant.factories import (AccountFactory, DepartmentAdministratorFactory,
+                                DepartmentFactory, UserFactory)
 from eggplant.profiles.models import UserProfile
 
 

eggplant/departments/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import url
-from django.views.generic import ListView, DetailView, CreateView, UpdateView, \
-    DeleteView
+from django.views.generic import (CreateView, DeleteView, DetailView, ListView,
+                                  UpdateView)
 
 from .models import Department
 

eggplant/departments/views.py

@@ -1,8 +1,7 @@
 from django.views.generic import ListView
-
+from eggplant.core.views import LoginRequiredMixin
 from eggplant.departments.models import Department
 from eggplant.profiles.models import UserProfile
-from eggplant.core.views import LoginRequiredMixin
 
 
 class DepartmentProfiles(LoginRequiredMixin, ListView):

eggplant/factories.py

@@ -1,8 +1,8 @@
 # coding: utf8
+import factory
 from django.conf import settings
-from django.db.models.signals import post_save
 from django.contrib.auth import get_user_model
-import factory
+from django.db.models.signals import post_save
 
 
 class UserFactory(factory.DjangoModelFactory):

eggplant/invitations/auth_backends.py

@@ -1,11 +1,10 @@
 import logging
+
+from allauth.account.models import EmailConfirmation
 from django.contrib.auth import get_user_model
 from django.contrib.auth.backends import ModelBackend
-from allauth.account.models import EmailConfirmation
-
 from eggplant.profiles.models import UserProfile
 
-
 log = logging.getLogger(__name__)
 
 

eggplant/invitations/forms.py

@@ -1,6 +1,5 @@
-from django import forms
-
 from captcha.fields import ReCaptchaField
+from django import forms
 
 from .models import DepartmentInvitation
 

eggplant/invitations/migrations/0001_initial.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 import uuid
+
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

eggplant/invitations/templates/eggplant/invitations/email/department_invitation.txt

@@ -4,4 +4,4 @@ Thank you for signing up as a member of the {{department}} department of {{coop_
 
 Please click the following link to confirm you email address and fill out your membership details:
 {{invite_url}}{% endblocktrans %}
-{% endblock %}
+{% endblock %}

eggplant/invitations/tests.py

@@ -7,10 +7,9 @@
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from eggplant.accounts.models import Account
-
 from eggplant.core.utils import absolute_url_reverse
-from eggplant.factories import UserFactory, DepartmentFactory, \
-    AccountCategoryFactory, DepartmentInvitationFactory
+from eggplant.factories import (AccountCategoryFactory, DepartmentFactory,
+                                DepartmentInvitationFactory, UserFactory)
 from eggplant.profiles.models import UserProfile
 
 from .models import DepartmentInvitation

eggplant/invitations/utils.py

@@ -1,6 +1,5 @@
-from django.contrib.auth import get_user_model
-
 from allauth.account.models import EmailAddress, EmailConfirmation
+from django.contrib.auth import get_user_model
 
 
 def create_verified_user(invitation):

eggplant/invitations/views.py

@@ -4,16 +4,15 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import authenticate, login
-from django.contrib.auth.decorators import permission_required, login_required
+from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.db import transaction
-from django.shortcuts import redirect, get_object_or_404, render
-
+from django.shortcuts import get_object_or_404, redirect, render
 from eggplant.accounts.models import Account
+from eggplant.invitations.forms import (AcceptInvitationForm,
+                                        DepartmentInvitationForm)
 from eggplant.invitations.models import DepartmentInvitation
-from eggplant.invitations.forms import AcceptInvitationForm, \
-    DepartmentInvitationForm
 from eggplant.invitations.utils import create_verified_user
 
 logger = logging.getLogger(__name__)
@@ -50,7 +49,9 @@ def do_accept_invitation(request, invitation):
     return user
 
 
-def accept_invitation(request, verification_key):
+# TODO: Fails McCabe test, C901 'accept_invitation' is too complex (11)
+# Refactor into FormView
+def accept_invitation(request, verification_key):  # NOQA
     """Accept invitation."""
     if request.user.is_authenticated():
         msg = "You are already logged-in"

eggplant/market/admin.py

@@ -1,14 +1,11 @@
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.sites import AlreadyRegistered
-
-
-from .models.inventory import Product, ProductCategory, ProductTax
-from .models.cart import Basket
-from .models import Payment, GetPaidPayment
-
 from getpaid.admin import PaymentAdmin
 
+from .models import GetPaidPayment, Payment
+from .models.cart import Basket
+from .models.inventory import Product, ProductCategory, ProductTax
 
 try:
     admin.site.register(GetPaidPayment, PaymentAdmin)

eggplant/market/filters.py

@@ -1,12 +1,11 @@
-from django.utils.safestring import mark_safe
-from django.forms.widgets import flatatt
+import django_filters
 from django.db.models.fields import BLANK_CHOICE_DASH
+from django.forms.widgets import flatatt
 from django.utils.encoding import force_text
 from django.utils.http import urlencode
+from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 
-import django_filters
-
 from .models.inventory import Product, ProductCategory
 
 

eggplant/market/forms.py

@@ -1,9 +1,8 @@
 from django import forms
 from django.forms import ModelForm
-from djmoney.settings import CURRENCY_CHOICES
+from eggplant.core.widgets import MoneyWidget
 
 from .models.inventory import Product
-from eggplant.core.widgets import MoneyWidget
 
 
 class BasketItemForm(forms.Form):

eggplant/market/migrations/0001_initial.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
-import djmoney.models.fields
-import django.utils.timezone
 from decimal import Decimal
+
+import django.utils.timezone
+import djmoney.models.fields
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):