Skip to content

Commit

Permalink
Merge pull request #5896 from radarhere/pip_install
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Dec 19, 2021
2 parents 2a38670 + e94a54c commit 0badf97
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-mingw.yml
Expand Up @@ -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: |
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/test.yml
Expand Up @@ -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 }}
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Expand Up @@ -50,16 +50,16 @@ 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:
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
Expand All @@ -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:
Expand All @@ -83,10 +83,10 @@ 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 setup.py install
python3 -m pip install .
-rm dist/*.egg
-rmdir dist
python3 -m pytest -qq
Expand Down
6 changes: 1 addition & 5 deletions docs/installation.rst
Expand Up @@ -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]"


Expand Down Expand Up @@ -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
^^^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 0badf97

Please sign in to comment.