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

Change subject: [deps] Update scripts dependencies ......................................................................

[deps] Update scripts dependencies

- match_images.py only depends on Pillow which is defined in extra_deps['Tkinter'] but not on flickrrapi - add dependency for flickrripper.py from extra_deps['Tkinter'] to remove code duplication - Remove import error warning in weblinkchecker.py to prevent script_tests failing. The warning is already printed by the pwb.py wrapper and by the suggest_help method later

Change-Id: I18f9c69c7c2e8457f350183a24363a931da15d3f --- M scripts/weblinkchecker.py M setup.py 2 files changed, 6 insertions(+), 14 deletions(-)

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

diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index db0556a..93d3285 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -121,7 +121,6 @@ import time

from functools import partial -from warnings import warn

try: import memento_client @@ -958,10 +957,6 @@ xmlFilename = None HTTPignore = []

- if isinstance(memento_client, ImportError): - warn('memento_client not imported: {0}'.format(memento_client), - ImportWarning) - # Process global args and prepare generator args parser local_args = pywikibot.handle_args(args) genFactory = pagegenerators.GeneratorFactory() diff --git a/setup.py b/setup.py index df7560f..af8b022 100644 --- a/setup.py +++ b/setup.py @@ -81,21 +81,18 @@

# ------- setup extra_requires for scripts ------- # script_deps = { + 'data_ingestion.py': extra_deps['csv'], 'flickrripper.py': [ '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"', - ], - 'patrol.py': ['mwparserfromhell>=0.3.3'], + ] + extra_deps['Tkinter'], + 'imageharvest.py': extra_deps['html'], + 'isbn.py': extra_deps['isbn'], + 'match_images.py': extra_deps['Tkinter'], + 'patrol.py': extra_deps['mwparserfromhell'], 'states_redirect.py': ['pycountry'], 'weblinkchecker.py': ['memento_client!=0.6.0,>=0.5.1'], } -script_deps['data_ingestion.py'] = extra_deps['csv'] -script_deps['imageharvest.py'] = extra_deps['html'] -script_deps['isbn.py'] = extra_deps['isbn'] -script_deps['match_images.py'] = script_deps['flickrripper.py']

extra_deps.update(script_deps) extra_deps.update({'scripts': [i for k, v in script_deps.items() for i in v]})