From 3d00b9c5120d834d37badac3637459189e7b356c Mon Sep 17 00:00:00 2001 From: Nulano Date: Tue, 2 Jan 2024 17:44:46 +0100 Subject: [PATCH] specify config settings after package --- .appveyor.yml | 4 ++-- .github/workflows/test-windows.yml | 2 +- winbuild/README.md | 4 ++-- winbuild/build.rst | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0f5dea9c5..2fedfc0f8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -38,7 +38,7 @@ install: build_script: - cd c:\pillow - winbuild\build\build_env.cmd -- '%PYTHON%\%EXECUTABLE% -m pip install -v -C raqm=vendor -C fribidi=vendor .' +- '%PYTHON%\%EXECUTABLE% -m pip install -v . -C raqm=vendor -C fribidi=vendor' - '%PYTHON%\%EXECUTABLE% selftest.py --installed' test_script: @@ -67,7 +67,7 @@ artifacts: before_deploy: - cd c:\pillow - - '%PYTHON%\%EXECUTABLE% -m pip wheel -v -C raqm=vendor -C fribidi=vendor .' + - '%PYTHON%\%EXECUTABLE% -m pip wheel -v . -C raqm=vendor -C fribidi=vendor' - ps: Get-ChildItem .\*.whl | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } deploy: diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 86cd5b5fa..0a8396675 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -167,7 +167,7 @@ jobs: - name: Build Pillow run: | $FLAGS="-C raqm=vendor -C fribidi=vendor" - cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS ." + cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v . $FLAGS" & $env:pythonLocation\python.exe selftest.py --installed shell: pwsh diff --git a/winbuild/README.md b/winbuild/README.md index 7e81abcb0..0773f9ee7 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -21,9 +21,9 @@ cd /D C:\Pillow\winbuild %PYTHON%\python.exe build_prepare.py -v --depends=C:\pillow-depends build\build_dep_all.cmd cd .. -%PYTHON%\python.exe -m pip install -v -C raqm=vendor -C fribidi=vendor . +%PYTHON%\python.exe -m pip install -v . -C raqm=vendor -C fribidi=vendor 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 -%PYTHON%\python.exe -m pip wheel -v -C raqm=vendor -C fribidi=vendor . +%PYTHON%\python.exe -m pip wheel -v . -C raqm=vendor -C fribidi=vendor ``` diff --git a/winbuild/build.rst b/winbuild/build.rst index a8e4ebaa6..90e479ddb 100644 --- a/winbuild/build.rst +++ b/winbuild/build.rst @@ -85,12 +85,12 @@ Once the dependencies are built, make sure the required environment variables are set by running ``winbuild\build\build_env.cmd`` and install Pillow with pip:: winbuild\build\build_env.cmd - python.exe -m pip install -v -C raqm=vendor -C fribidi=vendor . + python.exe -m pip install -v . -C raqm=vendor -C fribidi=vendor To build a wheel instead, run:: winbuild\build\build_env.cmd - python.exe -m pip wheel -v -C raqm=vendor -C fribidi=vendor . + python.exe -m pip wheel -v . -C raqm=vendor -C fribidi=vendor Testing Pillow -------------- @@ -113,8 +113,8 @@ The following is a simplified version of the script used on AppVeyor:: build\build_dep_all.cmd build\build_env.cmd cd .. - %PYTHON%\python.exe -m pip install -v -C raqm=vendor -C fribidi=vendor . + %PYTHON%\python.exe -m pip install -v . -C raqm=vendor -C fribidi=vendor 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 - %PYTHON%\python.exe -m pip wheel -v -C raqm=vendor -C fribidi=vendor . + %PYTHON%\python.exe -m pip wheel -v . -C raqm=vendor -C fribidi=vendor