Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Specify pip config settings after package #7686

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions winbuild/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
8 changes: 4 additions & 4 deletions winbuild/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------------
Expand All @@ -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