Skip to content

Commit 713ed87

Browse files
committed
build PyPy wheels on GHA; update installation docs
1 parent c04013f commit 713ed87

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/test-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888

8989
# GPL licensed; skip if building wheels
9090
- name: Build dependencies / libimagequant
91-
if: "github.event_name != 'push' || contains(matrix.python-version, 'pypy')"
91+
if: "github.event_name != 'push'"
9292
run: "& winbuild\\build\\build_dep_libimagequant.cmd"
9393

9494
# Raqm dependencies
@@ -143,14 +143,14 @@ jobs:
143143

144144
- name: Build wheel
145145
id: wheel
146-
if: "github.event_name == 'push' && !contains(matrix.python-version, 'pypy')"
146+
if: "github.event_name == 'push'"
147147
run: |
148148
for /f "tokens=3 delims=/" %%a in ("${{ github.ref }}") do echo ::set-output name=dist::dist-%%a
149149
winbuild\\build\\build_pillow.cmd bdist_wheel"
150150
shell: cmd
151151

152-
- uses: actions/upload-artifact@v2-preview
153-
if: "github.event_name == 'push' && !contains(matrix.python-version, 'pypy')"
152+
- uses: actions/upload-artifact@v2
153+
if: "github.event_name == 'push'"
154154
with:
155155
name: ${{ steps.wheel.outputs.dist }}
156156
path: dist\*.whl

docs/installation.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,10 @@ or from within the uncompressed source directory::
292292
Building on Windows
293293
^^^^^^^^^^^^^^^^^^^
294294

295-
There are build scripts and notes for the Windows build in the ``winbuild`` directory.
295+
We recommend you use prebuilt wheels from PyPI.
296+
If you wish to compile Pillow manually, you can use the build scripts
297+
in the ``winbuild`` directory used for CI testing and development.
298+
These scripts require Visual Studio 2017 or newer and NASM.
296299

297300
Building on FreeBSD
298301
^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)