jenkins-bot has submitted this change and it was merged.
Change subject: Add unicodecsv as test dep
......................................................................
Add unicodecsv as test dep
Change-Id: I259a4ca3534101a89d3bc65b2ca098cb1bd22542
---
M setup.py
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
XZise: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index 649d0b8..99e27ca 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,6 @@
'rcstream': ['socketIO-client'],
}
-test_deps.extend(extra_deps['rcstream'])
-
if sys.version_info[0] == 2:
# csv is used by wikistats and script data_ingestion
extra_deps['csv'] = ['unicodecsv']
@@ -86,11 +84,17 @@
test_deps += ['pywin32>=218', 'pywinauto>=0.4.0']
extra_deps.update(script_deps)
-# Add script dependencies as test dependencies,
-# so scripts can be compiled in test suite.
+
+# Add all script 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(*(script_deps.values())))
+# These extra dependencies enable some tests to run on all builds
+if sys.version_info[0] == 2:
+ test_deps += extra_deps['csv']
+test_deps += extra_deps['rcstream']
+
# late import of setuptools due to monkey-patching above
from ez_setup import use_setuptools
use_setuptools()
--
To view, visit https://gerrit.wikimedia.org/r/186173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I259a4ca3534101a89d3bc65b2ca098cb1bd22542
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: XZise <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
