jenkins-bot has submitted this change and it was merged.
Change subject: flickrapi v2 not usable on Python 2.6
......................................................................
flickrapi v2 not usable on Python 2.6
Bug: T107830
Change-Id: I5e93127323cad53ba2a247e1bd9716f7502cbd44
---
M requirements.txt
M setup.py
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
VcamX: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt
index 4410981..f4e1a20 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -66,7 +66,8 @@
# pkg_resources.VersionConflict: (requests 1.2.3
(/usr/lib/python2.7/site-packages), Requirement.parse('requests>=2.2.1'))
# If you see that on Python 2, change this to flickrapi==1.4.5
# On Python 3, force pip to install requests 2.2.1, or remove flickrapi below.
-flickrapi
+flickrapi>=1.4.5,<2 ; python_version < '2.7'
+flickrapi ; python_version >= '2.7'
# incomplete core component botirc
irc ; python_version > '2.6'
diff --git a/setup.py b/setup.py
index 01920d1..6738496 100644
--- a/setup.py
+++ b/setup.py
@@ -73,8 +73,8 @@
# and will be first packaged for Fedora Core 21.
# flickrapi 1.4.x does not run on Python 3, and setuptools can only
# select flickrapi 2.x for Python 3 installs.
-script_deps['flickrripper.py'].append('flickrapi' if sys.version_info[0] > 2
- else 'flickrapi>=1.4.5')
+script_deps['flickrripper.py'].append(
+ 'flickrapi>=1.4.5,<2' if PY26 else 'flickrapi')
# lunatic-python is only available for Linux
if sys.platform.startswith('linux'):
--
To view, visit https://gerrit.wikimedia.org/r/229071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e93127323cad53ba2a247e1bd9716f7502cbd44
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: VcamX <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
