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

Change subject: setup.py: Use flickrapi<2.3.1 for Python 3.3 ......................................................................

setup.py: Use flickrapi<2.3.1 for Python 3.3

Bug: T181351 Change-Id: I848bf7c30e7bcf0102494ccfd438422191edc1ad --- M requirements.txt M setup.py 2 files changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/requirements.txt b/requirements.txt index 98c9c0d..13598af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -71,7 +71,8 @@ # 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>=1.4.5,<2 ; python_version < '2.7' -flickrapi ; python_version >= '2.7' +flickrapi<2.3.1 ; python_version == '3.3' +flickrapi ; python_version >= '2.7' and python_version != '3.3'

# incomplete core component botirc irc ; python_version > '2.6' diff --git a/setup.py b/setup.py index efa5dc8..aa28872 100644 --- a/setup.py +++ b/setup.py @@ -92,8 +92,12 @@ # 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>=1.4.5,<2' if PY26 else 'flickrapi') +# flickrapi 2.3.1 dropped support for Python 3.3. +if PYTHON_VERSION[:2] == (3, 3): + script_deps['flickrripper.py'].append('flickrapi<2.3.1') +else: + 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'):