jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876343 )
Change subject: [dep] Adjust dependencies to preinstalled Toolforge packages
......................................................................
[dep] Adjust dependencies to preinstalled Toolforge packages
- update dependency versions to preinstalled Toolforge packages
except of PIL which is 5.4.1 on Toolforge
but vulnerability found in Pillow<8.1.1
- also adjust fake_useragent dependency
Change-Id: I8e7e6371a5e8261794177b3b68308afb3b1e242f
---
M dev-requirements.txt
M setup.py
M requirements.txt
3 files changed, 34 insertions(+), 16 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 8f204bf..a444c00 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -11,7 +11,8 @@
# pytest-httpbin needs httpbin needs werkzeug >= 0.14.1
# Python 3.8 needs werkzeug >= 0.15.5
# httpbin 0.7 fails with werkzeug 2.1.0/1 (T305124)
-werkzeug>=0.15.5, <2.1.0
+werkzeug>=0.14.1, <2.1.0; python_version<"3.8"
+werkzeug>=0.15.5, <2.1.0; python_version>="3.8"
pytest-httpbin
diff --git a/requirements.txt b/requirements.txt
index 862c1cf..5b0d8a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,11 +18,11 @@
# $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache
search
# mandatory dependencies, others are optional
-requests>=2.20.1, < 2.28.0; python_version < '3.7'
-requests>=2.20.1; python_version >= '3.7'
+requests>=2.21.0, < 2.28.0; python_version < '3.7'
+requests>=2.21.0; python_version >= '3.7'
setuptools>=48.0.0 ; python_version >= '3.10'
-setuptools>=38.5.2 ; python_version >= '3.7' and python_version <
'3.10'
-setuptools>=20.8.1, <59.7.0 ; python_version < '3.7'
+setuptools>=40.8.0 ; python_version >= '3.7' and python_version <
'3.10'
+setuptools>=40.8.0, <59.7.0 ; python_version < '3.7'
# MediaWiki markup parser
# mwparserfromhell is default, wikitextparser can be used instead
@@ -35,8 +35,8 @@
# about the user
mwoauth>=0.2.4,!=0.3.1
-# core interwiki_graph.py:
-pydot >= 1.2
+# interwiki_graph.py module and category_graph.py script:
+pydot >= 1.4.1
# cosmetic_changes
python-stdnum >= 1.17
@@ -53,7 +53,7 @@
PyMySQL >= 0.9.3
# core HTML comparison parser in diff module
-beautifulsoup4
+beautifulsoup4>=4.7.1
# scripts/weblinkchecker.py
memento_client==0.6.1
diff --git a/setup.py b/setup.py
index aac66f2..1c9edae 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
.. warning: do not upload a development release to pypi.
"""
#
-# (C) Pywikibot team, 2009-2022
+# (C) Pywikibot team, 2009-2023
#
# Distributed under the terms of the MIT license.
#
@@ -40,7 +40,7 @@
# Core library dependencies
'eventstreams': ['sseclient<0.0.23,>=0.0.18'], # T222885
'isbn': ['python-stdnum>=1.17'],
- 'Graphviz': ['pydot>=1.2'],
+ 'Graphviz': ['pydot>=1.4.1'],
'Google': ['google>=1.7'],
'memento': ['memento_client==0.6.1'],
'mwparserfromhell': ['mwparserfromhell>=0.5.0'],
@@ -49,8 +49,11 @@
# vulnerability found in Pillow<8.1.1 but toolforge uses 5.4.1
'Tkinter': ['Pillow>=8.1.1'],
'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'],
- 'html': ['BeautifulSoup4'],
- 'http': ['fake_useragent'],
+ 'html': ['beautifulsoup4>=4.7.1'],
+ 'http': [
+ 'fake_useragent<0.1.14; python_version < "3.7"',
+ 'fake_useragent>1.0.1; python_version >= "3.7"',
+ ],
'flake8': [ # Due to incompatibilities between packages the order matters.
'flake8>=5.0.2',
'darglint',
@@ -94,12 +97,12 @@
# ------- setup install_requires ------- #
# packages which are mandatory
dependencies = [
- 'requests>=2.20.1, <2.28.0; python_version < "3.7"',
- 'requests>=2.20.1; python_version>="3.7"',
+ 'requests>=2.21.0, <2.28.0; python_version < "3.7"',
+ 'requests>=2.21.0; python_version>="3.7"',
# PEP 440
'setuptools>=48.0.0 ; python_version >= "3.10"',
- 'setuptools>=38.5.2 ; python_version >= "3.7" and python_version
< "3.10"',
- 'setuptools>=20.8.1, <59.7.0 ; python_version < "3.7"',
+ 'setuptools>=40.8.0 ; python_version >= "3.7" and python_version
< "3.10"',
+ 'setuptools>=40.8.0, <59.7.0 ; python_version < "3.7"',
]
# in addition either mwparserfromhell or wikitextparser is required
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876343
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I8e7e6371a5e8261794177b3b68308afb3b1e242f
Gerrit-Change-Number: 876343
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged