jenkins-bot merged this change.

View Change

Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified
[deps] Update flickrapi requirements

Support for Python 2.7 and Python 3.4 will be dropped
with next release 3.0.

First explicit support for Python 3.5 was release 2.2

Change-Id: I4187d3246ef67066faba10fcc84f6a3f9abafff9
---
M requirements.txt
M setup.py
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a1a78dc..b688d45 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -50,7 +50,8 @@
sseclient >= 0.0.18,!=0.0.23,!=0.0.24

# scripts/flickrripper.py
-flickrapi
+flickrapi < 3.0.0 ; python_version < '3.5'
+flickrapi >= 2.2 ; python_version >= '3.5'

# textlib.py and patrol.py
mwparserfromhell>=0.3.3
diff --git a/setup.py b/setup.py
index a9a6467..2ef2645 100644
--- a/setup.py
+++ b/setup.py
@@ -83,7 +83,8 @@
# ------- setup extra_requires for scripts ------- #
script_deps = {
'flickrripper.py': [
- 'flickrapi',
+ 'flickrapi<3.0.0;python_version<"3.5"',
+ 'flickrapi>=2.2;python_version>="3.5"',
'Pillow<7.0.0;python_version<"3"',
'Pillow<6.0.0;python_version=="3.4"',
'Pillow;python_version>="3.5"',

To view, visit change 575677. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4187d3246ef67066faba10fcc84f6a3f9abafff9
Gerrit-Change-Number: 575677
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa@seznam.cz>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot (75)