Skip to content

Commit 2b2a80d

Browse files
committed
added Django 2.1 (beta) to test matrix, and renamed Python 3.7-rc to 3.7 (#254)
closes #254 Signed-off-by: Benjamin Wohlwend <[email protected]>
1 parent 1ff200b commit 2b2a80d

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

tests/.jenkins_exclude.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@ exclude:
22
# Django
33
- PYTHON_VERSION: python-2.7
44
FRAMEWORK: django-2.0
5+
- PYTHON_VERSION: python-2.7
6+
FRAMEWORK: django-2.1
57
- PYTHON_VERSION: python-2.7
68
FRAMEWORK: django-master
9+
- PYTHON_VERSION: python-3.4
10+
FRAMEWORK: django-2.1
711
- PYTHON_VERSION: python-3.4
812
FRAMEWORK: django-master
9-
- PYTHON_VERSION: python-3.7-rc
13+
- PYTHON_VERSION: python-3.7
1014
FRAMEWORK: django-1.11 # see https://code.djangoproject.com/ticket/28814
1115
- PYTHON_VERSION: pypy-2
1216
FRAMEWORK: django-2.0
17+
- PYTHON_VERSION: pypy-2
18+
FRAMEWORK: django-2.1
1319
- PYTHON_VERSION: pypy-2
1420
FRAMEWORK: django-master
1521
# Flask
@@ -24,14 +30,14 @@ exclude:
2430
FRAMEWORK: celery-3-django-2.0
2531
- PYTHON_VERSION: pypy-2
2632
FRAMEWORK: celery-4-django-2.0
27-
- PYTHON_VERSION: python-3.7-rc
33+
- PYTHON_VERSION: python-3.7
2834
FRAMEWORK: celery-3-django-1.11 # see https://code.djangoproject.com/ticket/28814
2935
# celery 4 doesn't currently work on Python 3.7, see https://github.com/celery/celery/issues/4500
30-
- PYTHON_VERSION: python-3.7-rc
36+
- PYTHON_VERSION: python-3.7
3137
FRAMEWORK: celery-4-django-2.0
32-
- PYTHON_VERSION: python-3.7-rc
38+
- PYTHON_VERSION: python-3.7
3339
FRAMEWORK: celery-4-django-1.11
34-
- PYTHON_VERSION: python-3.7-rc
40+
- PYTHON_VERSION: python-3.7
3541
FRAMEWORK: celery-4-flask-1.0
3642
# requests
3743
- PYTHON_VERSION: python-3.4
@@ -40,7 +46,7 @@ exclude:
4046
FRAMEWORK: requests-1.2
4147
- PYTHON_VERSION: python-3.6
4248
FRAMEWORK: requests-1.2
43-
- PYTHON_VERSION: python-3.7-rc
49+
- PYTHON_VERSION: python-3.7
4450
FRAMEWORK: requests-1.2
4551
- PYTHON_VERSION: pypy-3
4652
FRAMEWORK: requests-1.2
@@ -49,30 +55,30 @@ exclude:
4955
FRAMEWORK: pymongo-3.0
5056
- PYTHON_VERSION: python-3.6
5157
FRAMEWORK: pymongo-3.0
52-
- PYTHON_VERSION: python-3.7-rc
58+
- PYTHON_VERSION: python-3.7
5359
FRAMEWORK: pymongo-3.0
5460
- PYTHON_VERSION: python-3.6
5561
FRAMEWORK: pymongo-3.1
56-
- PYTHON_VERSION: python-3.7-rc
62+
- PYTHON_VERSION: python-3.7
5763
FRAMEWORK: pymongo-3.1
5864
- PYTHON_VERSION: python-3.6
5965
FRAMEWORK: pymongo-3.2
60-
- PYTHON_VERSION: python-3.7-rc
66+
- PYTHON_VERSION: python-3.7
6167
FRAMEWORK: pymongo-3.2
6268
- PYTHON_VERSION: python-3.6
6369
FRAMEWORK: pymongo-3.3
64-
- PYTHON_VERSION: python-3.7-rc
70+
- PYTHON_VERSION: python-3.7
6571
FRAMEWORK: pymongo-3.3
6672
- PYTHON_VERSION: python-3.6
6773
FRAMEWORK: pymongo-3.4
68-
- PYTHON_VERSION: python-3.7-rc
74+
- PYTHON_VERSION: python-3.7
6975
FRAMEWORK: pymongo-3.4
7076
- PYTHON_VERSION: pypy-3
7177
FRAMEWORK: pymongo-3.0
7278
# psycopg2
73-
- PYTHON_VERSION: python-3.7-rc
79+
- PYTHON_VERSION: python-3.7
7480
FRAMEWORK: psycopg2-2.5
75-
- PYTHON_VERSION: python-3.7-rc
81+
- PYTHON_VERSION: python-3.7
7682
FRAMEWORK: psycopg2-2.6
7783
- PYTHON_VERSION: pypy-3
7884
FRAMEWORK: psycopg2-2.5
@@ -85,7 +91,7 @@ exclude:
8591
FRAMEWORK: memcached-1.51
8692
- PYTHON_VERSION: python-3.6
8793
FRAMEWORK: memcached-1.51
88-
- PYTHON_VERSION: python-3.7-rc
94+
- PYTHON_VERSION: python-3.7
8995
FRAMEWORK: memcached-1.51
9096
- PYTHON_VERSION: pypy-3
9197
FRAMEWORK: memcached-1.51

tests/.jenkins_framework.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
FRAMEWORK:
44
- django-1.11
55
- django-2.0
6+
- django-2.1
67
- flask-0.12
78
- flask-1.0
89
- twisted-18

tests/.jenkins_framework_full.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ FRAMEWORK:
66
- django-1.10
77
- django-1.11
88
- django-2.0
9+
- django-2.1
910
# - django-master
1011
- flask-0.10
1112
- flask-0.11

tests/.jenkins_python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ PYTHON_VERSION:
33
- python-3.4
44
- python-3.5
55
- python-3.6
6-
- python-3.7-rc
6+
- python-3.7
77
- pypy-2
88
- pypy-3
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Django>=2.1b1,<2.2
2+
-r requirements-base.txt

0 commit comments

Comments
 (0)