Skip to content

Commit d04f3b7

Browse files
authored
add Django 4.0 (currently in Alpha 1) to test matrix (#1343)
* add Django 4.0 (currently in Alpha 1) to test matrix * don't run Django 4 on a Python version lower than 3.8
1 parent f6642cc commit d04f3b7

File tree

5 files changed

+13
-1
lines changed

5 files changed

+13
-1
lines changed

.ci/.jenkins_exclude.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
exclude:
22
- PYTHON_VERSION: pypy-3 # pypy3 currently fails on CI, e.g. https://apm-ci.elastic.co/blue/organizations/jenkins/apm-agent-python%2Fapm-agent-python-mbp/detail/PR-1099/2/pipeline#step-3497-log-1
33
FRAMEWORK: none
4+
# Django
5+
# Django 4.0 requires Python 3.8+
6+
- PYTHON_VERSION: pypy-3 # current pypy-3 is compatible with Python 3.7
7+
FRAMEWORK: django-4.0
8+
- PYTHON_VERSION: python-3.6
9+
FRAMEWORK: django-4.0
10+
- PYTHON_VERSION: python-3.7
11+
FRAMEWORK: django-4.0
412
# Flask
513
- PYTHON_VERSION: pypy-3
614
FRAMEWORK: flask-0.11 # see https://github.com/pallets/flask/commit/6e46d0cd, 0.11.2 was never released

.ci/.jenkins_framework.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ FRAMEWORK:
66
- django-2.0
77
- django-3.1
88
- django-3.2
9+
- django-4.0
910
- flask-0.12
1011
- flask-1.1
1112
- flask-2.0

.ci/.jenkins_framework_full.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ FRAMEWORK:
99
- django-3.0
1010
- django-3.1
1111
- django-3.2
12+
- django-4.0
1213
# - django-master
1314
- flask-0.10
1415
- flask-0.11

tests/contrib/django/testapp/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from tests.contrib.django.testapp import views
3838

3939
try:
40-
from django.conf.urls import re_path
40+
from django.urls import re_path
4141
except ImportError:
4242
# Django < 2
4343
from django.conf.urls import url as re_path
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Django>=4.0a1,<4.1
2+
-r reqs-base.txt

0 commit comments

Comments
 (0)