jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/434464 )
Change subject: setup.py: Flatten the extra_deps.items() before adding them to test_deps
......................................................................
setup.py: Flatten the extra_deps.items() before adding them to test_deps
extra_deps.items() is a list of lists. Although setuptools can handle
that, but statements like test_deps.remove('oursql') will not work.
Bug: T195287
Change-Id: I0265a8bd694323f99d37bc5faa78a502f3148e46
---
M setup.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index 2f7b9cc..f07c7a5 100644
--- a/setup.py
+++ b/setup.py
@@ -167,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 += [v for k, v in extra_deps.items() if k != 'flake8']
+ test_deps += [i for k, v in extra_deps.items() if k != 'flake8' for i in v]
if 'oursql' in test_deps and os.name == 'nt':
test_deps.remove('oursql') # depends on Cython
--
To view, visit
https://gerrit.wikimedia.org/r/434464
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0265a8bd694323f99d37bc5faa78a502f3148e46
Gerrit-Change-Number: 434464
Gerrit-PatchSet: 7
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>