From e7e05e2701e9d39f4d2766a8c1d302b3db12f641 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 18 Dec 2021 15:45:49 +1100 Subject: [PATCH 1/3] GHA: Restored macos-latest for PyPy builds --- .github/workflows/test.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 273e3689a92..414c7e94edd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,17 +31,6 @@ jobs: codecov-flag: GHA_Ubuntu - os: macos-latest codecov-flag: GHA_macOS - - os: macos-10.15 - codecov-flag: GHA_macOS - python-version: pypy-3.8 - - os: macos-10.15 - codecov-flag: GHA_macOS - python-version: pypy-3.7 - exclude: - - os: macos-latest - python-version: pypy-3.8 - - os: macos-latest - python-version: pypy-3.7 runs-on: ${{ matrix.os }} name: ${{ matrix.os }} Python ${{ matrix.python-version }} From a1677ead44326efbf6378eb2b55741c0bc326a5a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 18 Dec 2021 19:43:23 +1100 Subject: [PATCH 2/3] Switched from deprecated "setup.py install" to "pip install ." --- .github/workflows/test-mingw.yml | 2 +- Makefile | 8 ++++---- docs/installation.rst | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index 051cfc48347..d94c7d53751 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -60,7 +60,7 @@ jobs: pushd depends && ./install_extra_test_images.sh && popd - name: Build Pillow - run: CFLAGS="-coverage" python3 setup.py build_ext install + run: CFLAGS="-coverage" python3 -m pip install --global-option="build_ext" . - name: Test Pillow run: | diff --git a/Makefile b/Makefile index 546b9183844..04c586214c6 100644 --- a/Makefile +++ b/Makefile @@ -54,12 +54,12 @@ inplace: clean .PHONY: install install: - python3 setup.py install + python3 -m pip install . python3 selftest.py .PHONY: install-coverage install-coverage: - CFLAGS="-coverage -Werror=implicit-function-declaration" python3 setup.py build_ext install + CFLAGS="-coverage -Werror=implicit-function-declaration" python3 -m pip install --global-option="build_ext" . python3 selftest.py .PHONY: debug @@ -68,7 +68,7 @@ debug: # for our stuff, kills optimization, and redirects to dev null so we # see any build failures. make clean > /dev/null - CFLAGS='-g -O0' python3 setup.py build_ext install > /dev/null + CFLAGS='-g -O0' python3 -m pip install --global-option="build_ext" . > /dev/null .PHONY: install-req install-req: @@ -86,7 +86,7 @@ release-test: python3 setup.py develop python3 selftest.py python3 -m pytest Tests - python3 setup.py install + python3 -m pip install . -rm dist/*.egg -rmdir dist python3 -m pytest -qq diff --git a/docs/installation.rst b/docs/installation.rst index 1fb6897d279..df21a7cdc68 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -275,10 +275,6 @@ Build Options Sample usage:: - MAX_CONCURRENCY=1 python3 setup.py build_ext --enable-[feature] install - -or using pip:: - python3 -m pip install --upgrade Pillow --global-option="build_ext" --global-option="--enable-[feature]" @@ -310,7 +306,7 @@ Now install Pillow with:: or from within the uncompressed source directory:: - python3 setup.py install + python3 -m pip install . Building on Windows ^^^^^^^^^^^^^^^^^^^ From e94a54ce25a9692270d193eea5dabb5e71ed97dc Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 19 Dec 2021 12:13:37 +1100 Subject: [PATCH 3/3] Replaced further direct invocations of setup.py --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 04c586214c6..0dac63d3961 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ help: .PHONY: inplace inplace: clean - python3 setup.py develop build_ext --inplace + python3 -m pip install -e --global-option="build_ext" --global-option="--inplace" . .PHONY: install install: @@ -83,7 +83,7 @@ install-venv: .PHONY: release-test release-test: $(MAKE) install-req - python3 setup.py develop + python3 -m pip install -e . python3 selftest.py python3 -m pytest Tests python3 -m pip install .