jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1197006?usp=email )
Change subject: Tests: Update Pillow requirements and add pypy3.11 tests
......................................................................
Tests: Update Pillow requirements and add pypy3.11 tests
Bug: T407691
Change-Id: Id7757b4b2a94857895c9075a32cc61664fa1db7b
---
M .github/workflows/doctest.yml
M .github/workflows/login_tests-ci.yml
M .github/workflows/oauth_tests-ci.yml
M .github/workflows/pywikibot-ci.yml
M requirements.txt
M setup.py
6 files changed, 14 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index 11bf199..781bee6 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -22,7 +22,7 @@
fail-fast: false
max-parallel: 17
matrix:
- python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11',
'3.12', '3.13', '3.14']
+ python-version: [pypy3.8, pypy3.11, '3.8', '3.9', '3.10', '3.11',
'3.12', '3.13', '3.14']
os: ['windows-latest', 'macOS-latest', 'ubuntu-latest']
include:
- python-version: 3.15-dev
diff --git a/.github/workflows/login_tests-ci.yml
b/.github/workflows/login_tests-ci.yml
index b52bc64..fbd5072 100644
--- a/.github/workflows/login_tests-ci.yml
+++ b/.github/workflows/login_tests-ci.yml
@@ -42,7 +42,7 @@
fail-fast: false
max-parallel: 1
matrix:
- python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11',
'3.12', '3.13', '3.14', 3.15-dev]
+ python-version: [pypy3.8, pypy3.11, '3.8', '3.9', '3.10', '3.11',
'3.12', '3.13', '3.14', 3.15-dev]
site: ['wikipedia:en', 'wikisource:zh', 'wikipedia:test']
include:
- python-version: '3.8'
diff --git a/.github/workflows/oauth_tests-ci.yml
b/.github/workflows/oauth_tests-ci.yml
index 5895226..592d590 100644
--- a/.github/workflows/oauth_tests-ci.yml
+++ b/.github/workflows/oauth_tests-ci.yml
@@ -22,7 +22,7 @@
strategy:
fail-fast: false
matrix:
- python-version: [pypy3.8, pypy3.10, '3.8', '3.9', '3.10', '3.11',
'3.12', '3.13', '3.14', 3.15-dev]
+ python-version: [pypy3.8, pypy3.11, '3.8', '3.9', '3.10', '3.11',
'3.12', '3.13', '3.14', 3.15-dev]
family: [wikipedia]
code: [test]
domain: [test.wikipedia.org]
diff --git a/.github/workflows/pywikibot-ci.yml
b/.github/workflows/pywikibot-ci.yml
index d55a219..db37b20 100644
--- a/.github/workflows/pywikibot-ci.yml
+++ b/.github/workflows/pywikibot-ci.yml
@@ -25,7 +25,7 @@
fail-fast: false
max-parallel: 19
matrix:
- python-version: [pypy3.10, '3.8', '3.9', '3.10', '3.11', '3.12',
'3.13', '3.14']
+ python-version: [pypy3.10, pypy3.11, '3.8', '3.9', '3.10', '3.11',
'3.12', '3.13', '3.14']
site: ['wikipedia:en', 'wikisource:zh']
include:
- python-version: '3.8'
diff --git a/requirements.txt b/requirements.txt
index c6f3ef3..8b2ec76 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,8 +42,11 @@
python-stdnum >= 1.20
# GUI
-Pillow>=11.1.0; python_version > "3.8"
Pillow==10.4.0; python_version < "3.9"
+Pillow>=11.1.0,<11.3.0; python_version == "3.9"
+Pillow>=11.1.0,<11.3.0; platform_python_implementation == "PyPy" and
python_version < "3.11"
+Pillow>=11.1.0; platform_python_implementation == "PyPy" and python_version >=
"3.11"
+Pillow>=11.1.0; python_version >= "3.10"
# core pagegenerators
googlesearch-python >= 1.3.0
diff --git a/setup.py b/setup.py
index 80d62fa..1d199af 100755
--- a/setup.py
+++ b/setup.py
@@ -46,8 +46,13 @@
'mysql': ['PyMySQL >= 1.1.1'],
# vulnerability found in Pillow<8.1.2 but toolforge uses 5.4.1
'Tkinter': [
- 'Pillow>=11.1.0; python_version > "3.8"',
'Pillow==10.4.0; python_version < "3.9"',
+ 'Pillow>=11.1.0,<11.3.0; python_version == "3.9"',
+ 'Pillow>=11.1.0,<11.3.0; platform_python_implementation == "PyPy" '
+ 'and python_version < "3.11"',
+ 'Pillow>=11.1.0; platform_python_implementation == "PyPy" '
+ 'and python_version >= "3.11"',
+ 'Pillow>=11.1.0; python_version >= "3.10"',
],
'mwoauth': [
'PyJWT != 2.10.0, != 2.10.1; python_version > "3.8"', # T380270
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1197006?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Id7757b4b2a94857895c9075a32cc61664fa1db7b
Gerrit-Change-Number: 1197006
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
