diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7132a45..931d8a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,9 +21,13 @@ jobs: - 3.8 - 3.9 django-version: - - django~=2.2.0 - django~=3.0.0 - django~=3.1.0 + - django~=3.2.0 + include: + - django-version: django~=4.0a1 + python-version: 3.8 + experimental: true steps: - uses: actions/checkout@v2 diff --git a/django_x509/apps.py b/django_x509/apps.py index 90c40d7..3a3f619 100644 --- a/django_x509/apps.py +++ b/django_x509/apps.py @@ -1,5 +1,5 @@ from django.apps import AppConfig -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class DjangoX509Config(AppConfig): diff --git a/django_x509/base/admin.py b/django_x509/base/admin.py index 23a3887..e82a515 100644 --- a/django_x509/base/admin.py +++ b/django_x509/base/admin.py @@ -5,8 +5,8 @@ from django.shortcuts import get_object_or_404, render from django.urls import reverse from django.utils.html import format_html +from django.utils.translation import gettext_lazy as _ from django.utils.translation import ngettext -from django.utils.translation import ugettext_lazy as _ from django_x509 import settings as app_settings diff --git a/django_x509/base/models.py b/django_x509/base/models.py index d14ccd5..780ac63 100644 --- a/django_x509/base/models.py +++ b/django_x509/base/models.py @@ -9,7 +9,7 @@ from django.utils import timezone from django.utils.functional import cached_property from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from jsonfield import JSONField from model_utils.fields import AutoCreatedField, AutoLastModifiedField from OpenSSL import crypto diff --git a/requirements.txt b/requirements.txt index d7ddc47..9790109 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -django>=2.2.0,<3.2.0 +django>=3.0.0,<=4.0a1 openwisp-utils~=0.7.2 jsonfield>=3.1.0,<4.0.0 cryptography~=3.4