Skip to content

Commit

Permalink
Force separation of registration package
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblum committed Oct 11, 2017
1 parent f0315a9 commit 546efc1
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 4 deletions.
3 changes: 2 additions & 1 deletion registration/backends/admin_approval/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
from django.conf.urls import url
from django.contrib.auth.decorators import permission_required
from django.views.generic.base import TemplateView
from registration.backends.admin_approval.views import ResendActivationView

from .views import ActivationView
from .views import ApprovalView
from .views import RegistrationView

from registration.backends.admin_approval.views import ResendActivationView

urlpatterns = [
url(r'^activate/resend/$',
ResendActivationView.as_view(),
Expand Down
1 change: 1 addition & 0 deletions registration/tests/admin_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from django.test import TestCase
from django.test.client import Client
from django.test.utils import override_settings

from registration.models import RegistrationProfile
from registration.users import UserModel

Expand Down
5 changes: 3 additions & 2 deletions registration/tests/admin_approval_backend.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from django.core.urlresolvers import reverse
from django.test.utils import override_settings

from .default_backend import DefaultBackendViewTests

from registration.backends.admin_approval.views import RegistrationView
from registration.models import SupervisedRegistrationProfile
from registration.users import UserModel

from .default_backend import DefaultBackendViewTests


@override_settings(ROOT_URLCONF='test_app.urls_admin_approval')
class AdminApprovalBackendViewTests(DefaultBackendViewTests):
Expand Down
1 change: 1 addition & 0 deletions registration/tests/default_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from django.test import TestCase
from django.test.client import RequestFactory
from django.test.utils import override_settings

from registration.backends.default.views import RegistrationView
from registration.forms import RegistrationForm
from registration.models import RegistrationProfile
Expand Down
1 change: 1 addition & 0 deletions registration/tests/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import django
from django.test import TestCase
from django.utils import six

from registration import forms
from registration.users import UserModel

Expand Down
1 change: 1 addition & 0 deletions registration/tests/forms_custom_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from django.test import TestCase
from django.test.utils import override_settings

from registration import forms
from registration.users import UsernameField

Expand Down
1 change: 1 addition & 0 deletions registration/tests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from django.test import override_settings
from django.utils import six
from django.utils.timezone import now as datetime_now

from registration.models import RegistrationProfile
from registration.models import SupervisedRegistrationProfile
from registration.users import UserModel
Expand Down
1 change: 1 addition & 0 deletions registration/tests/simple_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.core.urlresolvers import reverse
from django.test import TestCase
from django.test import override_settings

from registration.forms import RegistrationForm
from registration.users import UserModel

Expand Down
1 change: 1 addition & 0 deletions registration/tests/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from django.conf.urls import include
from django.conf.urls import url
from django.views.generic import TemplateView

from registration.views import ActivationView
from registration.views import RegistrationView

Expand Down
1 change: 1 addition & 0 deletions registration/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from django.views.decorators.debug import sensitive_post_parameters
from django.views.generic.base import TemplateView
from django.views.generic.edit import FormView

from registration.forms import ResendActivationForm

REGISTRATION_FORM_PATH = getattr(settings, 'REGISTRATION_FORM',
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ ignore = E501

[isort]
force_single_line = True
forced_separate=registration
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import sys

from registration import get_version
from setuptools import find_packages
from setuptools import setup
from setuptools.command.test import test as TestCommand

from registration import get_version


class PyTest(TestCommand):

Expand Down

0 comments on commit 546efc1

Please sign in to comment.