Skip to content

Add Django 3.0 Beta to the test matrix, and replace Python 3.8 RC with 3.8 proper #612

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 1 commit into from
Oct 17, 2019
Merged

Add Django 3.0 Beta to the test matrix, and replace Python 3.8 RC with 3.8 proper #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 23 additions & 15 deletions .ci/.jenkins_exclude.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,20 @@ exclude:
FRAMEWORK: django-2.1
- PYTHON_VERSION: python-2.7
FRAMEWORK: django-2.2
- PYTHON_VERSION: python-2.7
FRAMEWORK: django-3.0
- PYTHON_VERSION: python-2.7
FRAMEWORK: django-master
- PYTHON_VERSION: python-3.4
FRAMEWORK: django-2.1
- PYTHON_VERSION: python-3.4
FRAMEWORK: django-2.2
- PYTHON_VERSION: python-3.4
FRAMEWORK: django-3.0
- PYTHON_VERSION: python-3.4
FRAMEWORK: django-master
- PYTHON_VERSION: python-3.5
FRAMEWORK: django-3.0
- PYTHON_VERSION: python-3.7
FRAMEWORK: django-1.11 # see https://code.djangoproject.com/ticket/28814
- PYTHON_VERSION: pypy-2
Expand All @@ -22,6 +28,8 @@ exclude:
FRAMEWORK: django-2.1
- PYTHON_VERSION: pypy-2
FRAMEWORK: django-2.2
- PYTHON_VERSION: pypy-2
FRAMEWORK: django-3.0
- PYTHON_VERSION: pypy-2
FRAMEWORK: django-master
# Flask
Expand All @@ -45,11 +53,11 @@ exclude:
FRAMEWORK: celery-4-django-1.11
- PYTHON_VERSION: python-3.7
FRAMEWORK: celery-4-flask-1.0
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: celery-4-django-2.0
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: celery-4-django-1.11
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: celery-4-flask-1.0
# requests
- PYTHON_VERSION: python-3.4
Expand All @@ -60,7 +68,7 @@ exclude:
FRAMEWORK: requests-1.2
- PYTHON_VERSION: python-3.7
FRAMEWORK: requests-1.2
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: requests-1.2
- PYTHON_VERSION: pypy-3
FRAMEWORK: requests-1.2
Expand All @@ -71,31 +79,31 @@ exclude:
FRAMEWORK: pymongo-3.0
- PYTHON_VERSION: python-3.7
FRAMEWORK: pymongo-3.0
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: pymongo-3.0
- PYTHON_VERSION: python-3.6
FRAMEWORK: pymongo-3.1
- PYTHON_VERSION: python-3.7
FRAMEWORK: pymongo-3.1
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: pymongo-3.1
- PYTHON_VERSION: python-3.6
FRAMEWORK: pymongo-3.2
- PYTHON_VERSION: python-3.7
FRAMEWORK: pymongo-3.2
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: pymongo-3.2
- PYTHON_VERSION: python-3.6
FRAMEWORK: pymongo-3.3
- PYTHON_VERSION: python-3.7
FRAMEWORK: pymongo-3.3
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: pymongo-3.3
- PYTHON_VERSION: python-3.6
FRAMEWORK: pymongo-3.4
- PYTHON_VERSION: python-3.7
FRAMEWORK: pymongo-3.4
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: pymongo-3.4
- PYTHON_VERSION: pypy-3
FRAMEWORK: pymongo-3.0
Expand All @@ -104,9 +112,9 @@ exclude:
FRAMEWORK: psycopg2-2.5
- PYTHON_VERSION: python-3.7
FRAMEWORK: psycopg2-2.6
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: psycopg2-2.5
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: psycopg2-2.6
- PYTHON_VERSION: pypy-3
FRAMEWORK: psycopg2-2.5
Expand All @@ -121,7 +129,7 @@ exclude:
FRAMEWORK: memcached-1.51
- PYTHON_VERSION: python-3.7
FRAMEWORK: memcached-1.51
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: memcached-1.51
- PYTHON_VERSION: pypy-3
FRAMEWORK: memcached-1.51
Expand All @@ -132,7 +140,7 @@ exclude:
FRAMEWORK: pymssql-newest
- PYTHON_VERSION: python-3.7 # currently fails with error on python 3.7 due to cython issues
FRAMEWORK: pymssql-newest
- PYTHON_VERSION: python-3.8-rc # currently fails with error on python 3.8 due to cython issues
- PYTHON_VERSION: python-3.8 # currently fails with error on python 3.8 due to cython issues
FRAMEWORK: pymssql-newest
# pyodbc
- PYTHON_VERSION: pypy-2
Expand All @@ -144,7 +152,7 @@ exclude:
FRAMEWORK: boto3-1.0
- PYTHON_VERSION: python-3.7
FRAMEWORK: boto3-1.0
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: boto3-1.0
- PYTHON_VERSION: pypy-3
FRAMEWORK: boto3-1.0
Expand All @@ -165,7 +173,7 @@ exclude:
FRAMEWORK: zerorpc-0.4
- PYTHON_VERSION: python-3.7
FRAMEWORK: zerorpc-0.4
- PYTHON_VERSION: python-3.8-rc
- PYTHON_VERSION: python-3.8
FRAMEWORK: zerorpc-0.4
# gevent
- PYTHON_VERSION: pypy-2 # see https://github.com/gevent/gevent/issues/1380, fix will be in gevent 1.5
Expand Down
2 changes: 1 addition & 1 deletion .ci/.jenkins_framework.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
FRAMEWORK:
- django-1.11
- django-2.0
- django-2.1
- django-2.2
- django-3.0
- flask-0.12
- flask-1.0
- opentracing-newest
Expand Down
3 changes: 1 addition & 2 deletions .ci/.jenkins_framework_full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
# or manually
FRAMEWORK:
- django-1.8
- django-1.9
- django-1.10
- django-1.11
- django-2.0
- django-2.1
- django-2.2
- django-3.0
# - django-master
- flask-0.10
- flask-0.11
Expand Down
2 changes: 1 addition & 1 deletion .ci/.jenkins_python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ PYTHON_VERSION:
- python-3.5
- python-3.6
- python-3.7
- python-3.8-rc
- python-3.8
- pypy-2
- pypy-3
2 changes: 1 addition & 1 deletion tests/requirements/requirements-django-2.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django>=2.1b1,<2.2
Django>=2.1,<2.2
-r requirements-base.txt
2 changes: 1 addition & 1 deletion tests/requirements/requirements-django-2.2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django>=2.2a1,<2.3
Django>=2.2,<2.3
-r requirements-base.txt
2 changes: 2 additions & 0 deletions tests/requirements/requirements-django-3.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Django>=3.0b1,<3.1
-r requirements-base.txt