Remove Django 1.8/1.10 from CI and readme

pull/3926/head
Matt Westcott 2017-10-11 16:32:52 +01:00
rodzic c80bbfcc5f
commit 5a0c36cdae
4 zmienionych plików z 13 dodań i 37 usunięć

Wyświetl plik

@ -14,32 +14,18 @@ addons:
matrix:
include:
- env: TOXENV=py35-dj18-postgres-noelasticsearch
python: 3.5
- env: TOXENV=py34-dj110-postgres-noelasticsearch
- env: TOXENV=py34-dj111-postgres-noelasticsearch
python: 3.4
- env: TOXENV=py34-dj110-sqlite-noelasticsearch
- env: TOXENV=py34-dj111-sqlite-noelasticsearch
python: 3.4
- env: TOXENV=py34-dj110-mysql-noelasticsearch
- env: TOXENV=py34-dj111-postgres-elasticsearch INSTALL_ELASTICSEARCH1=yes
python: 3.4
- env: TOXENV=py35-dj110-sqlite-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj110-postgres-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj110-mysql-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj110-postgres-elasticsearch INSTALL_ELASTICSEARCH1=yes
python: 3.5
sudo: true
- env: TOXENV=py35-dj110-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.5
sudo: true
- env: TOXENV=py35-dj110-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
python: 3.5
sudo: true
- env: TOXENV=py35-dj111-postgres-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj111-postgres-elasticsearch INSTALL_ELASTICSEARCH1=yes
- env: TOXENV=py35-dj111-mysql-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.5
sudo: true
- env: TOXENV=py36-dj111-sqlite-noelasticsearch
@ -58,11 +44,9 @@ matrix:
python: 3.6
sudo: true
allow_failures:
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky;
- env: TOXENV=py35-dj110-postgres-elasticsearch INSTALL_ELASTICSEARCH1=yes
- env: TOXENV=py35-dj110-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py35-dj110-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
- env: TOXENV=py35-dj111-postgres-elasticsearch INSTALL_ELASTICSEARCH1=yes
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
- env: TOXENV=py34-dj111-postgres-elasticsearch INSTALL_ELASTICSEARCH1=yes
- env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj111-postgres-elasticsearch INSTALL_ELASTICSEARCH1=yes
- env: TOXENV=py36-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes

Wyświetl plik

@ -80,7 +80,7 @@ We thank `BrowserStack <https://www.browserstack.com/>`_, who provide the projec
Compatibility
~~~~~~~~~~~~~
Wagtail supports Django 1.8.x, 1.10.x and 1.11.x, on Python 3.4, 3.5 and 3.6. Supported database backends are PostgreSQL, MySQL and SQLite.
Wagtail supports Django 1.11.x on Python 3.4, 3.5 and 3.6. Supported database backends are PostgreSQL, MySQL and SQLite.
Contributing
~~~~~~~~~~~~

Wyświetl plik

@ -21,7 +21,7 @@ except ImportError:
install_requires = [
"Django>=1.8.1,<1.12",
"Django>=1.11,<1.12",
"django-modelcluster>=3.1,<4.0",
"django-taggit>=0.20,<1.0",
"django-treebeard>=3.0,<5.0",
@ -86,8 +86,6 @@ setup(
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Topic :: Internet :: WWW/HTTP :: Site Management',
],

10
tox.ini
Wyświetl plik

@ -2,9 +2,7 @@
skipsdist = True
usedevelop = True
envlist = py{34,35}-dj{18,110}-{sqlite,postgres,mysql,mssql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
py{34,35,36}-dj111-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
flake8
envlist = py{34,35,36}-dj111-{sqlite,postgres,mysql,mssql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
[flake8]
# D100: Missing docstring in public module
@ -42,12 +40,8 @@ deps =
django-sendfile==0.3.6
Embedly
dj18: Django>=1.8.1,<1.9
dj110: Django>=1.10a1,<1.11
dj111: Django>=1.11b1,<2.0
dj18-mssql: django-pyodbc-azure==1.8.13.0
dj19-mssql: django-pyodbc-azure==1.9.6.0
dj110-mssql: django-pyodbc-azure==1.10.4.0
dj111-mssql: django-pyodbc-azure==1.11.0.0
postgres: psycopg2>=2.6
mysql: mysqlclient==1.3.6
elasticsearch: elasticsearch>=1,<2