From 469abe60f3eb9097f50799875c0e3c1e52003f5d Mon Sep 17 00:00:00 2001 From: Nick Travis Date: Tue, 27 Nov 2018 18:04:03 -0500 Subject: [PATCH] fixes #4928 remove deprecated references --- .travis.yml | 12 ------------ CONTRIBUTORS.rst | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ba7c6000b..856bdc4a5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 748deb51c9..58095b5692 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -334,6 +334,7 @@ Contributors * Seb Brown * Noah B Johnson * Hillary Jeffrey +* Nick Travis Translators ===========