Permalink
Browse files

Revert "Merge pull request #1040 from cclauss/patch-1"

This reverts commit 693b982, reversing
changes made to 3fcf16f.

This seems to cause many new build failures unrelated to flake8.

Before:
https://travis-ci.org/Supervisor/supervisor/builds/327894256

After:
https://travis-ci.org/Supervisor/supervisor/builds/327894256
  • Loading branch information...
mnaberez committed Jan 12, 2018
1 parent 693b982 commit 8058e8bb85c75dd546e05ddec8d6452e67b3ac7b
Showing with 1 addition and 4 deletions.
  1. +1 −1 .travis.yml
  2. +0 −3 tox.ini
View
@@ -20,7 +20,7 @@ matrix:
env: TOXENV=py36
install:
- travis_retry pip install virtualenv tox pexpect flake8
- travis_retry pip install virtualenv tox pexpect
script:
- travis_retry tox
View
@@ -15,17 +15,14 @@ commands =
basepython = python2.7
commands =
py.test --cov=supervisor --cov-report=term-missing --cov-report=xml {posargs}
flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
deps =
{[testenv]deps}
pytest-cov
flake8
[testenv:cover3]
basepython = python3.6
commands =
py.test --cov=supervisor --cov-report=term-missing --cov-report=xml {posargs}
flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
deps =
{[testenv:cover]deps}

0 comments on commit 8058e8b

Please sign in to comment.