Skip to content

Commit d46f418

Browse files
authored
Add Django 2.2 and Python 3.8 to CI config (django-webpack#228)
* Add Django 2.2 and Python 3.8 to CI config * Fix urls and middleware in test app
1 parent 152414c commit d46f418

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

Diff for: .circleci/config.yml

+23
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ workflows:
1717
- test-3.6-19
1818
- test-3.6-110
1919
- test-3.6-111
20+
- test-3.6-22
2021

2122
- test-3.7-18
2223
- test-3.7-19
2324
- test-3.7-110
2425
- test-3.7-111
26+
- test-3.7-22
27+
28+
- test-3.8-22
2529
jobs:
2630
base: &test-template
2731
docker:
@@ -141,6 +145,12 @@ jobs:
141145
- image: circleci/python:3.6-stretch-node
142146
environment:
143147
DJANGO_VERSION: "111"
148+
test-3.6-22:
149+
<<: *test-template
150+
docker:
151+
- image: circleci/python:3.6-stretch-node
152+
environment:
153+
DJANGO_VERSION: "22"
144154

145155
test-3.7-18:
146156
<<: *test-template
@@ -166,3 +176,16 @@ jobs:
166176
- image: circleci/python:3.7-stretch-node
167177
environment:
168178
DJANGO_VERSION: "111"
179+
test-3.7-22:
180+
<<: *test-template
181+
docker:
182+
- image: circleci/python:3.7-stretch-node
183+
environment:
184+
DJANGO_VERSION: "22"
185+
186+
test-3.8-22:
187+
<<: *test-template
188+
docker:
189+
- image: circleci/python:3.8-buster-node
190+
environment:
191+
DJANGO_VERSION: "22"

Diff for: tests/app/settings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
'django_jinja',
4343
)
4444

45-
MIDDLEWARE_CLASSES = (
45+
MIDDLEWARE = [
4646
'django.contrib.sessions.middleware.SessionMiddleware',
4747
'django.middleware.common.CommonMiddleware',
4848
'django.middleware.csrf.CsrfViewMiddleware',
@@ -51,7 +51,7 @@
5151
'django.contrib.messages.middleware.MessageMiddleware',
5252
'django.middleware.clickjacking.XFrameOptionsMiddleware',
5353
'django.middleware.security.SecurityMiddleware',
54-
)
54+
]
5555

5656
ROOT_URLCONF = 'app.urls'
5757

Diff for: tests/app/urls.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
1. Add an import: from blog import urls as blog_urls
1414
2. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls))
1515
"""
16-
from django.conf.urls import include, url
16+
from django.conf.urls import url
1717
from django.contrib import admin
1818
from django.views.generic import TemplateView
1919

2020

2121

2222
urlpatterns = [
2323
url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'),
24-
url(r'^admin/', include(admin.site.urls)),
24+
url(r'^admin/', admin.site.urls),
2525
]

Diff for: tests/requirements/django22.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
django>=2.2,<3
2+
django_jinja>=2.5

0 commit comments

Comments
 (0)