fixes #4928 remove deprecated references

pull/4932/head
Nick Travis 2018-11-27 18:04:03 -05:00 zatwierdzone przez Matt Westcott
rodzic 60bf798db1
commit 469abe60f3
2 zmienionych plików z 1 dodań i 12 usunięć

Wyświetl plik

@ -2,9 +2,6 @@ language: python
cache: pip
dist: trusty
# Use container-based infrastructure
sudo: false
addons:
postgresql: "9.6"
@ -25,36 +22,27 @@ matrix:
- env: TOXENV=py37-dj20-mysql-noelasticsearch
python: 3.7
dist: xenial
sudo: true
- env: TOXENV=py37-dj21-postgres-noelasticsearch
python: 3.7
dist: xenial
sudo: true
- env: TOXENV=py37-dj21-sqlite-noelasticsearch
python: 3.7
dist: xenial
sudo: true
- env: TOXENV=py36-djmaster-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.6
sudo: true
- env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.6
sudo: true
- env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
python: 3.6
sudo: true
- env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.6
sudo: true
- env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.6
sudo: true
- env: TOXENV=py37-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.7
dist: xenial
sudo: true
allow_failures:
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
- env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes

Wyświetl plik

@ -334,6 +334,7 @@ Contributors
* Seb Brown
* Noah B Johnson
* Hillary Jeffrey
* Nick Travis
Translators
===========