diff --git a/CHANGES b/CHANGES index 91820c1..d5397eb 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,7 @@ Version 0.9.7 (unreleased) * Remove six as a dependency * Move context and comment hints into the right-most column (#260 thanks @jieter) * Add extra styles block to the base template (#261 thanks @Frohus and @adamjforster) +* Test against Django 4.0-dev Version 0.9.6 diff --git a/rosetta/urls.py b/rosetta/urls.py index 9232720..0d8d8b2 100644 --- a/rosetta/urls.py +++ b/rosetta/urls.py @@ -1,10 +1,8 @@ -from django.conf.urls import re_path -from django.urls import reverse_lazy +from django.urls import re_path, reverse_lazy from django.views.generic.base import RedirectView from . import views - urlpatterns = [ re_path( r'^$', diff --git a/testproject/urls.py b/testproject/urls.py index 798cd99..b2782a6 100644 --- a/testproject/urls.py +++ b/testproject/urls.py @@ -1,7 +1,6 @@ -from django.conf.urls import include, re_path from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns - +from django.urls import include, re_path admin.autodiscover() diff --git a/tox.ini b/tox.ini index 6f5e42f..627ecec 100644 --- a/tox.ini +++ b/tox.ini @@ -2,15 +2,15 @@ envlist = flake8, py{36,37,38,39}-django{22,30,31,32}, - + py{38,39}-django40, gettext, docs [gh-actions] python = - 3.9: py39-django22, py39-django30, py39-django31, py39-django32 - 3.8: py38-django22, py38-django30, py38-django31, py38-django32 + 3.9: py39-django22, py39-django30, py39-django31, py39-django32, py39-django40 + 3.8: py38-django22, py38-django30, py38-django31, py38-django32, py38-django40 3.7: py37-django22, py37-django30, py37-django31, py37-django32, flake8 3.6: py36-django22, py36-django30, py36-django31, py36-django32, gettext, docs @@ -33,9 +33,10 @@ deps = django30: Django>=3.0,<=3.0.99 django31: Django>=3.1,<=3.1.99 django32: Django>=3.2a1,<=3.2.99 + django40: git+https://github.com/django/django.git - python-memcached - django32: pymemcache + django{22,30,31}: python-memcached + django{32,40}: pymemcache requests polib>=1.1.0 goslate