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

Support Django 3 #35

Open
wants to merge 2 commits into
base: support_django_2.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions accountsplus/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@
import django.utils.timezone
import django.core.validators
import django.contrib.sites.models
from django.utils.encoding import python_2_unicode_compatible

import timezone_field
import localflavor.us.models


logger = logging.getLogger(__name__)


@python_2_unicode_compatible
class BaseCompany(django.db.models.Model):
created_on = django.db.models.DateTimeField(auto_now_add=True)
updated_on = django.db.models.DateTimeField(auto_now=True)
Expand Down Expand Up @@ -84,7 +83,6 @@ def create_superuser(self, email, password, **extra_fields):
return self._create_user(email, password, **extra_fields)


@python_2_unicode_compatible
class BaseUser(django.contrib.auth.base_user.AbstractBaseUser, django.contrib.auth.models.PermissionsMixin):
USERNAME_FIELD = 'email'
REQUIRED_FIELDS = ('first_name', 'last_name', )
Expand Down Expand Up @@ -145,7 +143,6 @@ def set_random_password(self):
return pw


@python_2_unicode_compatible
class BaseAuditLogEvent(django.db.models.Model):
created_on = django.db.models.DateTimeField(auto_now_add=True)
updated_on = django.db.models.DateTimeField(auto_now=True)
Expand Down
4 changes: 2 additions & 2 deletions accountsplus/templates/accounts/locked_out.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load bootstrap3 %}
{% load static from staticfiles %}
{% load bootstrap4 %}
{% load static %}
{% load i18n %}

{% block content %}
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
setuptools
Django==2.2.1
Django==3.0.1
flake8
pep8
pyflakes
django-timezone-field>=2.0rc1
django-timezone-field
django-localflavor
bcrypt==3.1.0
bcrypt
mock
git+https://github.com/foundertherapy/django-axes.git@remove_dependency_on_ip
django-recaptcha