diff --git a/accountsplus/models.py b/accountsplus/models.py index 97bdfbc..e4fb346 100644 --- a/accountsplus/models.py +++ b/accountsplus/models.py @@ -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) @@ -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', ) @@ -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) diff --git a/accountsplus/templates/accounts/locked_out.html b/accountsplus/templates/accounts/locked_out.html index ac2a011..dbc2ed7 100644 --- a/accountsplus/templates/accounts/locked_out.html +++ b/accountsplus/templates/accounts/locked_out.html @@ -1,5 +1,5 @@ -{% load bootstrap3 %} -{% load static from staticfiles %} +{% load bootstrap4 %} +{% load static %} {% load i18n %} {% block content %} diff --git a/requirements.txt b/requirements.txt index 0d75a9c..540f904 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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