Drop support for Django 2.0 (#5684)

pull/5689/head
Matt Westcott 2019-11-06 17:05:04 +00:00 zatwierdzone przez GitHub
rodzic e75b74911e
commit 3e98563340
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
5 zmienionych plików z 4 dodań i 16 usunięć

Wyświetl plik

@ -7,12 +7,8 @@ addons:
matrix:
include:
- env: TOXENV=py35-dj20-sqlite-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj21-mysql-noelasticsearch
python: 3.5
- env: TOXENV=py36-dj20-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj21-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py37-dj21-postgres-noelasticsearch
@ -29,14 +25,10 @@ matrix:
python: 3.7
- env: TOXENV=py38-dj22-postgres-noelasticsearch
python: 3.8
- env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.6
- env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.6
- env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
python: 3.6
- env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.6
- env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.6
- env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
@ -47,10 +39,8 @@ matrix:
python: 3.8
allow_failures:
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
- env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
- env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py37-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes

Wyświetl plik

@ -77,7 +77,7 @@ an argument to ``runtests.py`` or ``tox``:
$ python runtests.py wagtail.core
$ # Running in a specified Tox environment
$ tox -e py36-dj20-sqlite-noelasticsearch wagtail.core
$ tox -e py36-dj22-sqlite-noelasticsearch wagtail.core
$ # See a list of available Tox environments
$ tox -l
@ -91,7 +91,7 @@ an argument to ``runtests.py``
$ python runtests.py wagtail.core.tests.test_blocks.TestIntegerBlock
$ # Running in a specified Tox environment
$ tox -e py36-dj20-sqlite-noelasticsearch wagtail.core.tests.test_blocks.TestIntegerBlock
$ tox -e py36-dj22-sqlite-noelasticsearch wagtail.core.tests.test_blocks.TestIntegerBlock
Running migrations for the test app models
------------------------------------------

Wyświetl plik

@ -131,5 +131,5 @@ The compatible versions of Django and Python for each Wagtail release are:
+-------------------+------------------------------+-----------------------------+
| 2.7 LTS | 2.0, 2.1, 2.2 | 3.5, 3.6, 3.7, 3.8 |
+-------------------+------------------------------+-----------------------------+
| 2.8 | 2.0, 2.1, 2.2 | 3.5, 3.6, 3.7, 3.8 |
| 2.8 | 2.1, 2.2 | 3.5, 3.6, 3.7, 3.8 |
+-------------------+------------------------------+-----------------------------+

Wyświetl plik

@ -98,7 +98,6 @@ https://github.com/wagtail/wagtail/.",
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Framework :: Django',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Framework :: Wagtail',

Wyświetl plik

@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True
envlist = py{35,36,37}-dj{20,21,22,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
envlist = py{35,36,37}-dj{21,22,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
[testenv]
install_command = pip install -e ".[testing]" -U {opts} {packages}
@ -23,7 +23,6 @@ deps =
django-sendfile==0.3.6
Embedly
dj20: Django>=2.0,<2.1
dj21: Django>=2.1,<2.2
dj22: Django>=2.2,<2.3
dj22stable: git+https://github.com/django/django.git@stable/2.2.x#egg=Django