diff --git a/.ci/.jenkins_exclude.yml b/.ci/.jenkins_exclude.yml index ab16c9225..89fc4ca75 100644 --- a/.ci/.jenkins_exclude.yml +++ b/.ci/.jenkins_exclude.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.ci/.jenkins_framework.yml b/.ci/.jenkins_framework.yml index 7eb1635af..6750102ea 100644 --- a/.ci/.jenkins_framework.yml +++ b/.ci/.jenkins_framework.yml @@ -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 diff --git a/.ci/.jenkins_framework_full.yml b/.ci/.jenkins_framework_full.yml index ca218a42a..af7d728b8 100644 --- a/.ci/.jenkins_framework_full.yml +++ b/.ci/.jenkins_framework_full.yml @@ -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 diff --git a/.ci/.jenkins_python.yml b/.ci/.jenkins_python.yml index 9227702f9..a276b4b0d 100644 --- a/.ci/.jenkins_python.yml +++ b/.ci/.jenkins_python.yml @@ -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 diff --git a/tests/requirements/requirements-django-2.1.txt b/tests/requirements/requirements-django-2.1.txt index b15d194dc..6ab12961a 100644 --- a/tests/requirements/requirements-django-2.1.txt +++ b/tests/requirements/requirements-django-2.1.txt @@ -1,2 +1,2 @@ -Django>=2.1b1,<2.2 +Django>=2.1,<2.2 -r requirements-base.txt diff --git a/tests/requirements/requirements-django-2.2.txt b/tests/requirements/requirements-django-2.2.txt index 9563e2a4e..657e0583f 100644 --- a/tests/requirements/requirements-django-2.2.txt +++ b/tests/requirements/requirements-django-2.2.txt @@ -1,2 +1,2 @@ -Django>=2.2a1,<2.3 +Django>=2.2,<2.3 -r requirements-base.txt diff --git a/tests/requirements/requirements-django-3.0.txt b/tests/requirements/requirements-django-3.0.txt new file mode 100644 index 000000000..c90c97618 --- /dev/null +++ b/tests/requirements/requirements-django-3.0.txt @@ -0,0 +1,2 @@ +Django>=3.0b1,<3.1 +-r requirements-base.txt