From 95bd47c46af575e2e23595b6173f21c37ca7d1e9 Mon Sep 17 00:00:00 2001 From: Daan Sprenkels Date: Wed, 4 Mar 2020 14:54:45 +0100 Subject: [PATCH 1/3] Bump django version --- requirements-production.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-production.txt b/requirements-production.txt index e3cb23b..790a3ae 100644 --- a/requirements-production.txt +++ b/requirements-production.txt @@ -1,5 +1,5 @@ setuptools -django==2.1 +django>=2.2,<2.3 mysqlclient https://projects.unbit.it/downloads/uwsgi-lts.tar.gz mutagen diff --git a/requirements.txt b/requirements.txt index cff865b..0900ae6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -django +django>=2.2,<2.3 mutagen argon2-cffi prometheus_client From a1116ca4cd2f33f219ae300bbbac018161ed4453 Mon Sep 17 00:00:00 2001 From: Gerdriaan Mulder Date: Sat, 28 Mar 2020 14:01:13 +0100 Subject: [PATCH 2/3] Remove python2 compatibility library django.utils.six --- marietje/marietje/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marietje/marietje/models.py b/marietje/marietje/models.py index 6421c5d..a81a443 100644 --- a/marietje/marietje/models.py +++ b/marietje/marietje/models.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import PermissionsMixin from django.contrib.auth.validators import ASCIIUsernameValidator, UnicodeUsernameValidator from django.core.mail import send_mail from django.db import models -from django.utils import six, timezone +from django.utils import timezone from django.utils.translation import ugettext_lazy as _ from marietje.utils import get_first_queue @@ -46,7 +46,7 @@ class UserManager(BaseUserManager): class User(AbstractBaseUser, PermissionsMixin): - username_validator = UnicodeUsernameValidator() if six.PY3 else ASCIIUsernameValidator() + username_validator = UnicodeUsernameValidator() username = models.CharField( _('username'), From 59993aa1c092dca6cacf32698534bb06c816266d Mon Sep 17 00:00:00 2001 From: Gerdriaan Mulder Date: Sat, 28 Mar 2020 14:07:00 +0100 Subject: [PATCH 3/3] Remove unused import ASCIIUsernameValidator --- marietje/marietje/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marietje/marietje/models.py b/marietje/marietje/models.py index a81a443..a1f1ae1 100644 --- a/marietje/marietje/models.py +++ b/marietje/marietje/models.py @@ -1,7 +1,7 @@ from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager from django.contrib.auth.hashers import make_password from django.contrib.auth.models import PermissionsMixin -from django.contrib.auth.validators import ASCIIUsernameValidator, UnicodeUsernameValidator +from django.contrib.auth.validators import UnicodeUsernameValidator from django.core.mail import send_mail from django.db import models from django.utils import timezone