Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devel #140

Merged
merged 3 commits into from Feb 7, 2020
Merged

Devel #140

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -7,6 +7,7 @@ dist/
.coverage/
django_invitations.egg-info/
.gitchangelog.rc
git-push.bat
.python-version
.coverage
/.idea/
Expand Down
2 changes: 0 additions & 2 deletions invitations/base_invitation.py
@@ -1,12 +1,10 @@
from django.conf import settings
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _

from .managers import BaseInvitationManager


@python_2_unicode_compatible
class AbstractBaseInvitation(models.Model):
accepted = models.BooleanField(verbose_name=_('accepted'), default=False)
key = models.CharField(verbose_name=_('key'), max_length=64, unique=True)
Expand Down
2 changes: 0 additions & 2 deletions invitations/models.py
Expand Up @@ -9,7 +9,6 @@
from django.db import models
from django.utils import timezone
from django.utils.crypto import get_random_string
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _

from . import signals
Expand All @@ -18,7 +17,6 @@
from .base_invitation import AbstractBaseInvitation


@python_2_unicode_compatible
class Invitation(AbstractBaseInvitation):
email = models.EmailField(unique=True, verbose_name=_('e-mail address'),
max_length=app_settings.EMAIL_MAX_LENGTH)
Expand Down
3 changes: 1 addition & 2 deletions invitations/utils.py
@@ -1,6 +1,5 @@
from django.apps import apps as django_apps
from django.core.exceptions import ImproperlyConfigured
from django.utils import six

from .app_settings import app_settings

Expand All @@ -11,7 +10,7 @@


def import_attribute(path):
assert isinstance(path, six.string_types)
assert isinstance(path, str)
pkg, attr = path.rsplit('.', 1)
ret = getattr(importlib.import_module(pkg), attr)
return ret
Expand Down
12 changes: 8 additions & 4 deletions tox.ini
@@ -1,9 +1,12 @@
[tox]
envlist =
py35-django{111,22}-backend{Basic,Allauth}
py36-django{111,22}-backend{Basic,Allauth}
py37-django{111,22}-backend{Basic,Allauth}
py38-django22-backend{Basic,Allauth}
py35-django{111}-backend{Basic}
py36-django{111}-backend{Basic}
py37-django{111}-backend{Basic}
py35-django22-backend{Basic,Allauth}
py36-django{22,3}-backend{Basic,Allauth}
py37-django{22,3}-backend{Basic,Allauth}
py38-django{22,3}-backend{Basic,Allauth}
flake8

[pytest]
Expand All @@ -16,6 +19,7 @@ deps =
-r requirements.txt
django111: Django>=1.11.17,<2.0
django22: Django>=2.2.6
django3: Django>=3.0.1
backendAllauth: django-allauth
commands =
python -V
Expand Down