jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/434347 )

Change subject: setup.py: Don't install flake8 dependencies if PYSETUP_TEST_EXTRAS is set ......................................................................

setup.py: Don't install flake8 dependencies if PYSETUP_TEST_EXTRAS is set

Test suites do not require flake8. After ca862f1809953bd5c15ed65d198e0508202e1c3f, some travis jobs are failing due the version conflicts within flake8 dependencies.

Change-Id: I9a4ebf3ea2c7ca85ca77a30109a272936078aa61 --- M setup.py 1 file changed, 1 insertion(+), 2 deletions(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/setup.py b/setup.py index 5572b63..2f7b9cc 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,6 @@ # from __future__ import absolute_import, print_function, unicode_literals

-import itertools import os import sys

@@ -168,7 +167,7 @@ # Add all dependencies as test dependencies, # so all scripts can be compiled for script_tests, etc. if 'PYSETUP_TEST_EXTRAS' in os.environ: - test_deps += list(itertools.chain(*(extra_deps.values()))) + test_deps += [v for k, v in extra_deps.items() if k != 'flake8'] if 'oursql' in test_deps and os.name == 'nt': test_deps.remove('oursql') # depends on Cython