jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Use Python 2.6 compatible unicodecsv version
......................................................................
[FIX] Use Python 2.6 compatible unicodecsv version
The oldest version of unicodecsv which supports Python 2.6 is 0.13.0. This is
now forcing that not a newer version is installed when Python 2.6 is used.
Bug: T113222
Change-Id: I6dc6608e23770e833cfe439f94912eecf26a0e17
---
M requirements.txt
M setup.py
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt
index e6cc25a..c7db758 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -45,7 +45,8 @@
git+https://github.com/nlhepler/pydot#egg=pydot-1.0.29
# wikistats.py and scripts
-unicodecsv ; python_version < '3'
+unicodecsv<=0.13 ; python_version < '2.7'
+unicodecsv ; python_version < '3' and python_version >= '2.7'
# cosmetic_changes and scripts/isbn
python-stdnum
diff --git a/setup.py b/setup.py
index 8fe7a0e..2a2d63f 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,7 @@
# the irc module has no Python 2.6 support since 10.0
irc_dep = 'irc==8.9' if sys.version_info < (2, 7) else 'irc'
+csv_dep = 'unicodecsv<=0.13' if PYTHON_VERSION < (2, 7) else
'unicodecsv'
extra_deps = {
# Core library dependencies
@@ -59,7 +60,7 @@
if PY2:
# Additional core library dependencies which are only available on Python 2
extra_deps.update({
- 'csv': ['unicodecsv'],
+ 'csv': [csv_dep],
'MySQL': ['oursql'],
'unicode7': ['unicodedata2>=7.0.0-2'],
})
--
To view, visit
https://gerrit.wikimedia.org/r/239812
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6dc6608e23770e833cfe439f94912eecf26a0e17
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>