From 37902826bd2906ce65c08e3682be3c54dec4eb56 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Mon, 7 Nov 2016 14:04:33 -0600 Subject: [PATCH] bug 1314613: Drop dennis from TravisCI tasks The new locales task includes running dennis to lint the locales, so it is no longer needed as a seperate tox / TravisCI task. --- .travis.yml | 2 -- tox.ini | 6 ------ 2 files changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21099100a3b..e586a41fe3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ env: - TOXENV=py27 - TOXENV=flake8 - TOXENV=docs - - TOXENV=dennis - TOXENV=locales DOCKER_COMPOSE_VERSION=1.8.0 - TOXENV=docker DOCKER_COMPOSE_VERSION=1.8.0 global: @@ -27,7 +26,6 @@ env: - CFLAGS=-O0 matrix: allow_failures: - - env: TOXENV=dennis - env: TOXENV=locales DOCKER_COMPOSE_VERSION=1.8.0 - env: TOXENV=docker DOCKER_COMPOSE_VERSION=1.8.0 before_install: diff --git a/tox.ini b/tox.ini index 8b62a03f803..aa4aff33f3d 100644 --- a/tox.ini +++ b/tox.ini @@ -25,12 +25,6 @@ basepython = python2.7 deps = -rrequirements/docs.txt commands = sphinx-build -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html -[testenv:dennis] -basepython = python2.7 -# TODO: Update to released version of dennis when aca57f6d is released. -deps = https://github.com/willkg/dennis/archive/aca57f6d.zip -commands = dennis-cmd lint --errorsonly locale/ - [testenv:locales] whitelist_externals = cat