Merge pull request #5896 from radarhere/pip_install

This commit is contained in:
Hugo van Kemenade 2021-12-19 15:39:47 +02:00 committed by GitHub
commit 0badf97592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 23 deletions

View File

@ -60,7 +60,7 @@ jobs:
pushd depends && ./install_extra_test_images.sh && popd pushd depends && ./install_extra_test_images.sh && popd
- name: Build Pillow - 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 - name: Test Pillow
run: | run: |

View File

@ -31,17 +31,6 @@ jobs:
codecov-flag: GHA_Ubuntu codecov-flag: GHA_Ubuntu
- os: macos-latest - os: macos-latest
codecov-flag: GHA_macOS 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 }} runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} Python ${{ matrix.python-version }} name: ${{ matrix.os }} Python ${{ matrix.python-version }}

View File

@ -50,16 +50,16 @@ help:
.PHONY: inplace .PHONY: inplace
inplace: clean inplace: clean
python3 setup.py develop build_ext --inplace python3 -m pip install -e --global-option="build_ext" --global-option="--inplace" .
.PHONY: install .PHONY: install
install: install:
python3 setup.py install python3 -m pip install .
python3 selftest.py python3 selftest.py
.PHONY: install-coverage .PHONY: install-coverage
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 python3 selftest.py
.PHONY: debug .PHONY: debug
@ -68,7 +68,7 @@ debug:
# for our stuff, kills optimization, and redirects to dev null so we # for our stuff, kills optimization, and redirects to dev null so we
# see any build failures. # see any build failures.
make clean > /dev/null 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 .PHONY: install-req
install-req: install-req:
@ -83,10 +83,10 @@ install-venv:
.PHONY: release-test .PHONY: release-test
release-test: release-test:
$(MAKE) install-req $(MAKE) install-req
python3 setup.py develop python3 -m pip install -e .
python3 selftest.py python3 selftest.py
python3 -m pytest Tests python3 -m pytest Tests
python3 setup.py install python3 -m pip install .
-rm dist/*.egg -rm dist/*.egg
-rmdir dist -rmdir dist
python3 -m pytest -qq python3 -m pytest -qq

View File

@ -275,10 +275,6 @@ Build Options
Sample usage:: 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]" 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:: or from within the uncompressed source directory::
python3 setup.py install python3 -m pip install .
Building on Windows Building on Windows
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^