Skip to content

Commit b379ea2

Browse files
authored
Add Django 3.0 Beta to the test matrix, and replace Python 3.8 RC with 3.8 proper (#612)
1 parent 4193d7d commit b379ea2

File tree

7 files changed

+30
-21
lines changed

7 files changed

+30
-21
lines changed

.ci/.jenkins_exclude.yml

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ exclude:
66
FRAMEWORK: django-2.1
77
- PYTHON_VERSION: python-2.7
88
FRAMEWORK: django-2.2
9+
- PYTHON_VERSION: python-2.7
10+
FRAMEWORK: django-3.0
911
- PYTHON_VERSION: python-2.7
1012
FRAMEWORK: django-master
1113
- PYTHON_VERSION: python-3.4
1214
FRAMEWORK: django-2.1
1315
- PYTHON_VERSION: python-3.4
1416
FRAMEWORK: django-2.2
17+
- PYTHON_VERSION: python-3.4
18+
FRAMEWORK: django-3.0
1519
- PYTHON_VERSION: python-3.4
1620
FRAMEWORK: django-master
21+
- PYTHON_VERSION: python-3.5
22+
FRAMEWORK: django-3.0
1723
- PYTHON_VERSION: python-3.7
1824
FRAMEWORK: django-1.11 # see https://code.djangoproject.com/ticket/28814
1925
- PYTHON_VERSION: pypy-2
@@ -22,6 +28,8 @@ exclude:
2228
FRAMEWORK: django-2.1
2329
- PYTHON_VERSION: pypy-2
2430
FRAMEWORK: django-2.2
31+
- PYTHON_VERSION: pypy-2
32+
FRAMEWORK: django-3.0
2533
- PYTHON_VERSION: pypy-2
2634
FRAMEWORK: django-master
2735
# Flask
@@ -45,11 +53,11 @@ exclude:
4553
FRAMEWORK: celery-4-django-1.11
4654
- PYTHON_VERSION: python-3.7
4755
FRAMEWORK: celery-4-flask-1.0
48-
- PYTHON_VERSION: python-3.8-rc
56+
- PYTHON_VERSION: python-3.8
4957
FRAMEWORK: celery-4-django-2.0
50-
- PYTHON_VERSION: python-3.8-rc
58+
- PYTHON_VERSION: python-3.8
5159
FRAMEWORK: celery-4-django-1.11
52-
- PYTHON_VERSION: python-3.8-rc
60+
- PYTHON_VERSION: python-3.8
5361
FRAMEWORK: celery-4-flask-1.0
5462
# requests
5563
- PYTHON_VERSION: python-3.4
@@ -60,7 +68,7 @@ exclude:
6068
FRAMEWORK: requests-1.2
6169
- PYTHON_VERSION: python-3.7
6270
FRAMEWORK: requests-1.2
63-
- PYTHON_VERSION: python-3.8-rc
71+
- PYTHON_VERSION: python-3.8
6472
FRAMEWORK: requests-1.2
6573
- PYTHON_VERSION: pypy-3
6674
FRAMEWORK: requests-1.2
@@ -71,31 +79,31 @@ exclude:
7179
FRAMEWORK: pymongo-3.0
7280
- PYTHON_VERSION: python-3.7
7381
FRAMEWORK: pymongo-3.0
74-
- PYTHON_VERSION: python-3.8-rc
82+
- PYTHON_VERSION: python-3.8
7583
FRAMEWORK: pymongo-3.0
7684
- PYTHON_VERSION: python-3.6
7785
FRAMEWORK: pymongo-3.1
7886
- PYTHON_VERSION: python-3.7
7987
FRAMEWORK: pymongo-3.1
80-
- PYTHON_VERSION: python-3.8-rc
88+
- PYTHON_VERSION: python-3.8
8189
FRAMEWORK: pymongo-3.1
8290
- PYTHON_VERSION: python-3.6
8391
FRAMEWORK: pymongo-3.2
8492
- PYTHON_VERSION: python-3.7
8593
FRAMEWORK: pymongo-3.2
86-
- PYTHON_VERSION: python-3.8-rc
94+
- PYTHON_VERSION: python-3.8
8795
FRAMEWORK: pymongo-3.2
8896
- PYTHON_VERSION: python-3.6
8997
FRAMEWORK: pymongo-3.3
9098
- PYTHON_VERSION: python-3.7
9199
FRAMEWORK: pymongo-3.3
92-
- PYTHON_VERSION: python-3.8-rc
100+
- PYTHON_VERSION: python-3.8
93101
FRAMEWORK: pymongo-3.3
94102
- PYTHON_VERSION: python-3.6
95103
FRAMEWORK: pymongo-3.4
96104
- PYTHON_VERSION: python-3.7
97105
FRAMEWORK: pymongo-3.4
98-
- PYTHON_VERSION: python-3.8-rc
106+
- PYTHON_VERSION: python-3.8
99107
FRAMEWORK: pymongo-3.4
100108
- PYTHON_VERSION: pypy-3
101109
FRAMEWORK: pymongo-3.0
@@ -104,9 +112,9 @@ exclude:
104112
FRAMEWORK: psycopg2-2.5
105113
- PYTHON_VERSION: python-3.7
106114
FRAMEWORK: psycopg2-2.6
107-
- PYTHON_VERSION: python-3.8-rc
115+
- PYTHON_VERSION: python-3.8
108116
FRAMEWORK: psycopg2-2.5
109-
- PYTHON_VERSION: python-3.8-rc
117+
- PYTHON_VERSION: python-3.8
110118
FRAMEWORK: psycopg2-2.6
111119
- PYTHON_VERSION: pypy-3
112120
FRAMEWORK: psycopg2-2.5
@@ -121,7 +129,7 @@ exclude:
121129
FRAMEWORK: memcached-1.51
122130
- PYTHON_VERSION: python-3.7
123131
FRAMEWORK: memcached-1.51
124-
- PYTHON_VERSION: python-3.8-rc
132+
- PYTHON_VERSION: python-3.8
125133
FRAMEWORK: memcached-1.51
126134
- PYTHON_VERSION: pypy-3
127135
FRAMEWORK: memcached-1.51
@@ -132,7 +140,7 @@ exclude:
132140
FRAMEWORK: pymssql-newest
133141
- PYTHON_VERSION: python-3.7 # currently fails with error on python 3.7 due to cython issues
134142
FRAMEWORK: pymssql-newest
135-
- PYTHON_VERSION: python-3.8-rc # currently fails with error on python 3.8 due to cython issues
143+
- PYTHON_VERSION: python-3.8 # currently fails with error on python 3.8 due to cython issues
136144
FRAMEWORK: pymssql-newest
137145
# pyodbc
138146
- PYTHON_VERSION: pypy-2
@@ -144,7 +152,7 @@ exclude:
144152
FRAMEWORK: boto3-1.0
145153
- PYTHON_VERSION: python-3.7
146154
FRAMEWORK: boto3-1.0
147-
- PYTHON_VERSION: python-3.8-rc
155+
- PYTHON_VERSION: python-3.8
148156
FRAMEWORK: boto3-1.0
149157
- PYTHON_VERSION: pypy-3
150158
FRAMEWORK: boto3-1.0
@@ -165,7 +173,7 @@ exclude:
165173
FRAMEWORK: zerorpc-0.4
166174
- PYTHON_VERSION: python-3.7
167175
FRAMEWORK: zerorpc-0.4
168-
- PYTHON_VERSION: python-3.8-rc
176+
- PYTHON_VERSION: python-3.8
169177
FRAMEWORK: zerorpc-0.4
170178
# gevent
171179
- PYTHON_VERSION: pypy-2 # see https://github.com/gevent/gevent/issues/1380, fix will be in gevent 1.5

.ci/.jenkins_framework.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
FRAMEWORK:
44
- django-1.11
55
- django-2.0
6-
- django-2.1
76
- django-2.2
7+
- django-3.0
88
- flask-0.12
99
- flask-1.0
1010
- opentracing-newest

.ci/.jenkins_framework_full.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
# or manually
33
FRAMEWORK:
44
- django-1.8
5-
- django-1.9
6-
- django-1.10
75
- django-1.11
86
- django-2.0
97
- django-2.1
108
- django-2.2
9+
- django-3.0
1110
# - django-master
1211
- flask-0.10
1312
- flask-0.11

.ci/.jenkins_python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ PYTHON_VERSION:
44
- python-3.5
55
- python-3.6
66
- python-3.7
7-
- python-3.8-rc
7+
- python-3.8
88
- pypy-2
99
- pypy-3
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Django>=2.1b1,<2.2
1+
Django>=2.1,<2.2
22
-r requirements-base.txt
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Django>=2.2a1,<2.3
1+
Django>=2.2,<2.3
22
-r requirements-base.txt
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Django>=3.0b1,<3.1
2+
-r requirements-base.txt

0 commit comments

Comments
 (0)