jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/984507 ) Change subject: [requirement] Use "Pillow >= 8.1.2, != 10.0, != 10.1" ...................................................................... [requirement] Use "Pillow >= 8.1.2, != 10.0, != 10.1" Bug: T341198 Change-Id: I84f48449f3330918a3655548262b33af65d6be34 --- M .appveyor.yml M setup.py M requirements.txt M pywikibot/userinterfaces/gui.py 4 files changed, 17 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 66cdc07..bbd7bef 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -63,11 +63,10 @@ # Download the AppVeyor Python build accessories into subdirectory .\appveyor - mkdir appveyor - python --version - - python -c "import platform; print(platform.machine())" - python -c "import struct; print('PYTHON_ARCH:', struct.calcsize('P') << 3)" - pip --version - if [%PYTHON_VERSION%]==[3.7.0] pip install "urllib3<2.0" - - if [%PYTHON_ARCH%]==[32] pip install "Pillow >= 8.1.2, < 10.0.0" + - if [%PYTHON_ARCH%]==[32] pip install "Pillow >= 8.1.2, != 10.0, != 10.1" - pip install -r requirements.txt - pip install -r dev-requirements.txt - pip install wikitextparser diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 387a34e..43774f3 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -5,10 +5,10 @@ .. note:: idlelib, tkinter and pillow modules are required. .. warning:: - With Pillow 10 no wheels for 32-bit Python on Windows are supported. - This was made for Python 3.12 compatibility. Either you have to - update your Python using a 64-bit version or you have to - :command:`pip install "pillow < 10.0.0"`. + With Pillow 10.0, 10.1 no wheels for 32-bit Python on Windows are + supported. Pillow 10.2 supports it again. Either you have to update + your Python using a 64-bit version or you have to + :command:`pip install "pillow>8.1.1,!=10.0,!=10.1"`. .. seealso:: :mod:`editor` """ diff --git a/requirements.txt b/requirements.txt index 9d0fd0e..b96e57c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,8 +40,7 @@ python-stdnum >= 1.19 # GUI -Pillow >= 8.1.2, < 10.0.0; platform_machine == 'AMD32' -Pillow >= 8.1.2; platform_machine != 'AMD32' +Pillow >= 8.1.2, != 10.0, != 10.1 # core pagegenerators google >= 1.7 diff --git a/setup.py b/setup.py index 609e4e2..74957b6 100755 --- a/setup.py +++ b/setup.py @@ -46,8 +46,7 @@ 'wikitextparser': ['wikitextparser>=0.47.0'], 'mysql': ['PyMySQL >= 0.9.3'], # toolforge # vulnerability found in Pillow<8.1.2 but toolforge uses 5.4.1 - 'Tkinter': ['Pillow>=8.1.2, < 10.0.0; platform_machine == "AMD32"', - 'Pillow>=8.1.2; platform_machine != "AMD32"'], + 'Tkinter': ['Pillow>=8.1.2, != 10.0, != 10.1'], 'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'], 'html': ['beautifulsoup4>=4.7.1'], 'http': ['fake-useragent>1.2.1'], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/984507 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: I84f48449f3330918a3655548262b33af65d6be34 Gerrit-Change-Number: 984507 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged