[deps] Update scrips dependencies

Bug: T223826 Change-Id: I062a7c72c28ab588f13009e74b3f370f976d5587
iamentry · Feb 21, 2021 · 3052007 · 3052007
1 parent 9c4a076
commit 3052007
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 32 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -18,7 +18,7 @@
 #     or
 # $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search
 
-# mandatory; see README-conversion.txt
+# mandatory
 requests>=2.20.1, < 2.26.0; python_version < '3.6'
 requests>=2.20.1 ; python_version >= '3.6'
 setuptools>=20.2, !=50.0.0, <50.2.0 ; python_version < '3.6'
@@ -29,8 +29,8 @@ setuptools>=20.2 ; python_version >= '3.6'
 # about the user
 mwoauth>=0.2.4,!=0.3.1
 
-# cosmetic_changes and scripts/isbn
-python-stdnum >= 1.15
+# cosmetic_changes
+python-stdnum >= 1.16
 
 # GUI
 Pillow >= 6.2.2, < 8.0.0 ; python_version < '3.6'
@@ -41,9 +41,6 @@ Pillow >= 8.0.0 ; python_version >= '3.9'
 google >= 1.7
 sseclient >= 0.0.18,!=0.0.23,!=0.0.24
 
-# scripts/flickrripper.py
-flickrapi >= 2.2
-
 # textlib.py and patrol.py
 mwparserfromhell>=0.3.3
 
@@ -53,13 +50,5 @@ PyMySQL
 # core HTML comparison parser in diff module
 beautifulsoup4
 
-# scripts/states_redirect.py
-pycountry
-
 # scripts/weblinkchecker.py
 memento_client>=0.5.1,!=0.6.0
-
-# tools/__init__.py
-# pywikibot prefers using the inbuilt bz2 module if python was compiled with
-# bz2 support. But if it wasn't, bz2file is used instead.
-# bz2file
diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@ def python_is_supported():
 extra_deps = {
     # Core library dependencies
     'eventstreams': ['sseclient!=0.0.23,!=0.0.24,>=0.0.18'],
-    'isbn': ['python-stdnum>=1.15'],
+    'isbn': ['python-stdnum>=1.16'],
     'Google': ['google>=1.7'],
     'mwparserfromhell': ['mwparserfromhell>=0.3.3'],
     'Tkinter': [  # vulnerability found in Pillow<6.2.2
@@ -94,14 +94,6 @@ def python_is_supported():
 
 # ------- setup extra_requires for scripts ------- #
 script_deps = {
-    'flickrripper.py': [
-        'flickrapi>=2.2',
-    ] + 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'],
 }
 
@@ -118,17 +110,9 @@ def python_is_supported():
     'setuptools>=20.2 ; python_version >= "3.6"',
 ]
 
-try:
-    import bz2
-except ImportError:  # pragma: no cover
-    # Use bz2file if the python is not compiled with bz2 support.
-    dependencies.append('bz2file')
-else:
-    assert bz2
-
 
 # ------- setup tests_require ------- #
-test_deps = ['bz2file', 'mock']
+test_deps = ['mock']
 # Some of the ui_tests depend on accessing the console window's menu
 # to set the console font and copy and paste, achieved using pywinauto
 # which depends on pywin32.