From bd2fdd686a50bab99e553eeb3ac5b46999977a80 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 24 Jun 2023 13:48:47 +1000 Subject: [PATCH 1/3] Wrap arguments before passing in documentation --- winbuild/README.md | 4 ++-- winbuild/build.rst | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/winbuild/README.md b/winbuild/README.md index 2975acf283f..24b3eacdf88 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -20,10 +20,10 @@ set PYTHON=C:\Python38\bin cd /D C:\Pillow\winbuild C:\Python39\bin\python.exe build_prepare.py -v --depends=C:\pillow-depends build\build_dep_all.cmd -build\build_pillow.cmd install +build\build_pillow.cmd --global-option="install" cd .. path C:\Pillow\winbuild\build\bin;%PATH% %PYTHON%\python.exe selftest.py %PYTHON%\python.exe -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests -build\build_pillow.cmd bdist_wheel +build\build_pillow.cmd --global-option="bdist_wheel" ``` diff --git a/winbuild/build.rst b/winbuild/build.rst index 99dfad3015f..c0d4c5c86c4 100644 --- a/winbuild/build.rst +++ b/winbuild/build.rst @@ -87,9 +87,9 @@ Building Pillow --------------- Once the dependencies are built, run -``winbuild\build\build_pillow.cmd install`` to build and install +``winbuild\build\build_pillow.cmd --global-option="install"`` to build and install Pillow for the selected version of Python. -``winbuild\build\build_pillow.cmd bdist_wheel`` will build wheels +``winbuild\build\build_pillow.cmd --global-option="bdist_wheel"`` will build wheels instead of installing Pillow. You can also use ``winbuild\build\build_pillow.cmd --inplace develop`` to build @@ -114,9 +114,9 @@ The following is a simplified version of the script used on AppVeyor:: cd /D C:\Pillow\winbuild C:\Python39\bin\python.exe build_prepare.py -v --depends C:\pillow-depends build\build_dep_all.cmd - build\build_pillow.cmd install + build\build_pillow.cmd --global-option="install" cd .. path C:\Pillow\winbuild\build\bin;%PATH% %PYTHON%\python.exe selftest.py %PYTHON%\python.exe -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests - build\build_pillow.cmd bdist_wheel + build\build_pillow.cmd --global-option="bdist_wheel" From 0e1f86a425075db3a755db2e81502ec6eb6ba9e0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 24 Jun 2023 13:49:47 +1000 Subject: [PATCH 2/3] Updated pyproject-fmt to 0.12.1 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f4b695883eb..26762605007 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: - id: sphinx-lint - repo: https://github.com/tox-dev/pyproject-fmt - rev: 0.11.2 + rev: 0.12.1 hooks: - id: pyproject-fmt From 600b823de6acbe6c3920633af4c64f6db61565d4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 24 Jun 2023 13:50:27 +1000 Subject: [PATCH 3/3] Removed unused code --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 522c2099111..e2a941ee23e 100755 --- a/setup.py +++ b/setup.py @@ -137,7 +137,6 @@ class RequiredDependencyException(Exception): PLATFORM_MINGW = os.name == "nt" and "GCC" in sys.version -PLATFORM_PYPY = hasattr(sys, "pypy_version_info") def _dbg(s, tp=None):