Merge pull request #76 from rsalmaso/isort

Isort configuration

Author: benjaoming

django_nyt/admin.py

@@ -1,8 +1,6 @@
 from django.contrib import admin
 from django.utils.translation import gettext as _
-
-from django_nyt import models
-from django_nyt import settings
+from django_nyt import models, settings
 
 
 class SettingsAdmin(admin.ModelAdmin):

django_nyt/decorators.py

@@ -1,11 +1,9 @@
 import json
-
 from functools import wraps
 
-from django.http import HttpResponse
-from django.contrib.auth.decorators import login_required
-
 import django_nyt
+from django.contrib.auth.decorators import login_required
+from django.http import HttpResponse
 
 
 def disable_notify(f):

django_nyt/management/commands/notifymail.py

@@ -10,10 +10,8 @@
 from django.core import mail
 from django.core.management.base import BaseCommand
 from django.template.loader import render_to_string
-from django.utils.translation import gettext as _
-from django.utils.translation import activate, deactivate
-from django_nyt import settings as nyt_settings
-from django_nyt import models
+from django.utils.translation import activate, deactivate, gettext as _
+from django_nyt import models, settings as nyt_settings
 
 # Daemon / mail loop sleep between each database poll (seconds)
 SLEEP_TIME = 120

django_nyt/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

django_nyt/migrations/0002_notification_settings.py

@@ -1,5 +1,5 @@
-from django.db import models, migrations
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

django_nyt/migrations/0003_subscription.py

@@ -1,4 +1,4 @@
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

django_nyt/migrations/0004_notification_subscription.py

@@ -1,5 +1,5 @@
-from django.db import models, migrations
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

django_nyt/migrations/0005__v_0_9_2.py

@@ -1,6 +1,6 @@
-from django.db import models, migrations
 import django.db.models.deletion
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

django_nyt/migrations/0006_auto_20141229_1630.py

@@ -1,4 +1,4 @@
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

django_nyt/migrations/0007_add_modified_and_default_settings.py

@@ -1,5 +1,5 @@
-from django.utils import timezone
 from django.db import migrations, models
+from django.utils import timezone
 
 
 class Migration(migrations.Migration):

django_nyt/migrations/0008_auto_20161023_1641.py

@@ -1,6 +1,6 @@
+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):

django_nyt/subscribers.py

@@ -2,8 +2,7 @@
 
 from channels import Group
 
-from . import settings
-from . import models
+from . import models, settings
 
 logger = logging.getLogger(__name__)
 

django_nyt/tests/__init__.py

@@ -1,3 +1,3 @@
 from .test_basic import *  # noqa
-from .test_views import *  # noqa
 from .test_management import *  # noqa
+from .test_views import *  # noqa

django_nyt/tests/test_basic.py

@@ -1,7 +1,6 @@
 from django.contrib.auth import get_user_model
 from django.test import TestCase
-
-from django_nyt import utils, models
+from django_nyt import models, utils
 
 User = get_user_model()
 

django_nyt/tests/test_management.py

@@ -1,13 +1,12 @@
 import os
 import signal
 import time
+from tempfile import NamedTemporaryFile
 
 from django.core.management import call_command
 
+from .. import models, utils
 from .test_basic import NotifyTestBase
-from .. import models
-from .. import utils
-from tempfile import NamedTemporaryFile
 
 
 class CommandTest(NotifyTestBase):

django_nyt/urls.py

@@ -1,5 +1,5 @@
 from django import VERSION as DJANGO_VERSION
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
 from . import views
 

django_nyt/utils.py

@@ -1,9 +1,7 @@
 from django.db.models import Model
 from django.utils.translation import gettext as _
 
-from . import _disable_notifications
-from . import models
-from . import settings
+from . import _disable_notifications, models, settings
 
 
 def notify(message, key, target_object=None, url=None, filter_exclude={}, recipient_users=None):

django_nyt/views.py

@@ -1,10 +1,9 @@
-from django.db.models import Q
-
-from django_nyt.decorators import json_view, login_required_ajax
-from django_nyt import models
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import redirect, get_object_or_404
+from django.db.models import Q
+from django.shortcuts import get_object_or_404, redirect
 from django.utils.translation import gettext as _
+from django_nyt import models
+from django_nyt.decorators import json_view, login_required_ajax
 
 
 @login_required_ajax

runtests.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 import os
 import sys
+
 from django.conf import settings
+from django.core.management import execute_from_command_line
 
 INSTALLED_APPS = [
     'django.contrib.auth',
@@ -57,7 +59,6 @@
 )
 
 
-from django.core.management import execute_from_command_line
 argv = [sys.argv[0], "test"]
 
 if len(sys.argv) == 1:

setup.cfg

@@ -9,3 +9,13 @@ ignore = E226,E302,E303,E41,E501
 max-line-length = 160
 max-complexity = 10
 exclude = */*migrations
+
+[isort]
+combine_as_imports = true
+default_section = THIRDPARTY
+include_trailing_comma = true
+line_length = 160
+multi_line_output = 5
+not_skip = __init__.py
+skip = docs/conf.py
+indent = 4

setup.py

@@ -1,8 +1,7 @@
 import os
 
-from setuptools import find_packages, setup
-
 from django_nyt import __version__
+from setuptools import find_packages, setup
 
 
 def get_path(fname):

test-project/testapp/admin.py

@@ -2,5 +2,4 @@
 
 from . import models
 
-
 admin.site.register(models.TestModel)

test-project/testapp/forms.py

@@ -2,6 +2,7 @@
 
 from . import models
 
+
 class TestModelForm(forms.ModelForm):
 
     class Meta:

test-project/testapp/migrations/0002_createtestusers.py

@@ -2,7 +2,6 @@
 from django_nyt.utils import subscribe
 from testapp.models import NOTIFICATION_TEST_KEY
 
-
 FIXTURES = (
     ('bob', 'bob@example.com'),
     ('alice', 'alice@example.com'),

test-project/testapp/models.py

@@ -1,11 +1,10 @@
 import logging
 
-from django_nyt.utils import notify
-
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils.translation import gettext as _
+from django_nyt.utils import notify
 
 logger = logging.getLogger(__name__)
 

test-project/testapp/views.py

@@ -1,18 +1,14 @@
-from django.contrib.auth import get_user_model
-from django.contrib.auth import login
+from django.contrib.auth import get_user_model, login
 from django.shortcuts import redirect
+from django.utils.decorators import method_decorator
 from django.views.generic.base import TemplateView
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import CreateView
-
+from django_nyt.decorators import json_view
 from django_nyt.forms import SettingsForm
 from django_nyt.models import Notification, Settings
-from django_nyt.decorators import json_view
-
-from . import forms
-from . import models
 
-from django.utils.decorators import method_decorator
+from . import forms, models
 
 
 class TestIndex(TemplateView):

test-project/testproject/settings/__init__.py

@@ -1,4 +1,8 @@
+import os
 from os import path as os_path
+
+from django import VERSION
+
 PROJECT_PATH = os_path.abspath(os_path.split(os_path.dirname(__file__))[0])
 
 DEBUG = True
@@ -91,7 +95,6 @@
     'testapp',
 ]
 
-from django import VERSION
 if VERSION <= (1, 6):
     INSTALLED_APPS.append('south')
     SOUTH_MIGRATION_MODULES = {
@@ -101,7 +104,6 @@
     TEST_RUNNER = 'django.test.runner.DiscoverRunner'
 
 
-import os
 
 LOGGING = {
     'version': 1,
@@ -152,6 +154,3 @@
 
 
 NYT_ENABLE_ADMIN = True
-
-
-

test-project/testproject/urls.py

@@ -1,12 +1,12 @@
 import django.views.static
+from django.conf import settings
+from django.contrib import admin
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 try:
     from django.urls import include, re_path as url
 except ImportError:
     from django.conf.urls import include, url
-from django.conf import settings
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from django.contrib import admin
 
 
 admin.autodiscover()