Skip to content

Add Django 2.2 and Python 3.8 to CI config #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 27, 2020
Merged

Add Django 2.2 and Python 3.8 to CI config #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac693b6
Add Django 2.2 and Python 3.8 to CI config
bhrutledge Apr 27, 2020
d32021a
Fix urls and middleware in test app
bhrutledge Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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"
4 changes: 2 additions & 2 deletions tests/app/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
'django_jinja',
)

MIDDLEWARE_CLASSES = (
MIDDLEWARE = [
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
Expand All @@ -51,7 +51,7 @@
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware',
)
]

ROOT_URLCONF = 'app.urls'

Expand Down
4 changes: 2 additions & 2 deletions tests/app/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
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



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),
]
2 changes: 2 additions & 0 deletions tests/requirements/django22.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
django>=2.2,<3
django_jinja>=2.5