diff --git a/.circleci/config.yml b/.circleci/config.yml index 133da49e..15a9b689 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,11 +17,15 @@ workflows: - test-3.6-19 - test-3.6-110 - test-3.6-111 + - test-3.6-22 - test-3.7-18 - test-3.7-19 - test-3.7-110 - test-3.7-111 + - test-3.7-22 + + - test-3.8-22 jobs: base: &test-template docker: @@ -141,6 +145,12 @@ jobs: - image: circleci/python:3.6-stretch-node environment: DJANGO_VERSION: "111" + test-3.6-22: + <<: *test-template + docker: + - image: circleci/python:3.6-stretch-node + environment: + DJANGO_VERSION: "22" test-3.7-18: <<: *test-template @@ -166,3 +176,16 @@ jobs: - image: circleci/python:3.7-stretch-node environment: DJANGO_VERSION: "111" + test-3.7-22: + <<: *test-template + docker: + - image: circleci/python:3.7-stretch-node + environment: + DJANGO_VERSION: "22" + + test-3.8-22: + <<: *test-template + docker: + - image: circleci/python:3.8-buster-node + environment: + DJANGO_VERSION: "22" diff --git a/tests/app/settings.py b/tests/app/settings.py index 9913cf33..e61a5a14 100644 --- a/tests/app/settings.py +++ b/tests/app/settings.py @@ -42,7 +42,7 @@ 'django_jinja', ) -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = [ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -51,7 +51,7 @@ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', -) +] ROOT_URLCONF = 'app.urls' diff --git a/tests/app/urls.py b/tests/app/urls.py index b1ad5f06..664958f1 100644 --- a/tests/app/urls.py +++ b/tests/app/urls.py @@ -13,7 +13,7 @@ 1. Add an import: from blog import urls as blog_urls 2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls)) """ -from django.conf.urls import include, url +from django.conf.urls import url from django.contrib import admin from django.views.generic import TemplateView @@ -21,5 +21,5 @@ urlpatterns = [ url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'), - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), ] diff --git a/tests/requirements/django22.txt b/tests/requirements/django22.txt new file mode 100644 index 00000000..84b1670c --- /dev/null +++ b/tests/requirements/django22.txt @@ -0,0 +1,2 @@ +django>=2.2,<3 +django_jinja>=2.5