Skip to content

Commit c9ce9c9

Browse files
hugovkhugovk
authored
Merge branch 'master' into rm-3.5
2 parents e5ac276 + 4174d42 commit c9ce9c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+604
-330
lines changed

‎.ci/install.sh

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ pip install test-image-results
3232
pip install numpy
3333

3434
# TODO Remove when 3.9-dev includes setuptools 49.3.2+:
35-
if [ "$TRAVIS_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi
3635
if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi
3736

3837
if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then

‎.github/workflows/test-windows.yml

+31-20
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,27 @@ jobs:
198198
msys:
199199
runs-on: windows-2019
200200

201+
strategy:
202+
fail-fast: false
203+
matrix:
204+
mingw: ["MINGW32", "MINGW64"]
205+
include:
206+
- mingw: "MINGW32"
207+
name: "MSYS2 MinGW 32-bit"
208+
package: "mingw-w64-i686"
209+
- mingw: "MINGW64"
210+
name: "MSYS2 MinGW 64-bit"
211+
package: "mingw-w64-x86_64"
212+
201213
defaults:
202214
run:
203215
shell: bash.exe --login -eo pipefail "{0}"
204216
env:
205-
MSYSTEM: MINGW64
217+
MSYSTEM: ${{ matrix.mingw }}
206218
CHERE_INVOKING: 1
207219

208220
timeout-minutes: 30
209-
name: MSYS2 MinGW 64-bit
221+
name: ${{ matrix.name }}
210222

211223
steps:
212224
- uses: actions/checkout@v2
@@ -218,23 +230,22 @@ jobs:
218230
- name: Install Dependencies
219231
run: |
220232
pacman -S --noconfirm \
221-
mingw-w64-x86_64-python3-pip \
222-
mingw-w64-x86_64-python3-setuptools \
223-
mingw-w64-x86_64-python3-pytest \
224-
mingw-w64-x86_64-python3-pytest-cov \
225-
mingw-w64-x86_64-python3-cffi \
226-
mingw-w64-x86_64-python3-olefile \
227-
mingw-w64-x86_64-python3-numpy \
228-
mingw-w64-x86_64-python3-pyqt5 \
229-
mingw-w64-x86_64-python3-numpy \
230-
mingw-w64-x86_64-freetype \
231-
mingw-w64-x86_64-lcms2 \
232-
mingw-w64-x86_64-libwebp \
233-
mingw-w64-x86_64-libjpeg-turbo \
234-
mingw-w64-x86_64-openjpeg2 \
235-
mingw-w64-x86_64-libimagequant \
236-
mingw-w64-x86_64-libraqm \
237-
mingw-w64-x86_64-ghostscript \
233+
${{ matrix.package }}-python3-cffi \
234+
${{ matrix.package }}-python3-numpy \
235+
${{ matrix.package }}-python3-olefile \
236+
${{ matrix.package }}-python3-pip \
237+
${{ matrix.package }}-python3-pyqt5 \
238+
${{ matrix.package }}-python3-pytest \
239+
${{ matrix.package }}-python3-pytest-cov \
240+
${{ matrix.package }}-python3-setuptools \
241+
${{ matrix.package }}-freetype \
242+
${{ matrix.package }}-ghostscript \
243+
${{ matrix.package }}-lcms2 \
244+
${{ matrix.package }}-libimagequant \
245+
${{ matrix.package }}-libjpeg-turbo \
246+
${{ matrix.package }}-libraqm \
247+
${{ matrix.package }}-libwebp \
248+
${{ matrix.package }}-openjpeg2 \
238249
subversion
239250
240251
python3 -m pip install pyroma
@@ -256,4 +267,4 @@ jobs:
256267
python3 -m pip install codecov
257268
bash <(curl -s https://codecov.io/bash) -F GHA_Windows
258269
env:
259-
CODECOV_NAME: MSYS2 MinGW 64-bit
270+
CODECOV_NAME: ${{ matrix.name }}

‎.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 6bedb5c58a7d8c25aa9509f8217bc24e9797e90d # frozen: 19.10b0
3+
rev: e66be67b9b6811913470f70c28b4d50f94d05b22 # frozen: 20.8b1
44
hooks:
55
- id: black
66
args: ["--target-version", "py36"]
@@ -9,7 +9,7 @@ repos:
99
types: []
1010

1111
- repo: https://github.com/timothycrosley/isort
12-
rev: 9ae09866e278fbc6ec0383ccb16b5c84e78e6e4d # frozen: 5.3.2
12+
rev: 377d260ffa6f746693f97b46d95025afc4bd8275 # frozen: 5.4.2
1313
hooks:
1414
- id: isort
1515

@@ -31,7 +31,7 @@ repos:
3131
additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
3232

3333
- repo: https://github.com/pre-commit/pygrep-hooks
34-
rev: 20b9ac745c5adaab12b845b3564c773dcc051d0e # frozen: v1.5.2
34+
rev: eae6397e4c259ed3d057511f6dd5330b92867e62 # frozen: v1.6.0
3535
hooks:
3636
- id: python-check-blanket-noqa
3737
- id: rst-backticks

‎CHANGES.rst

+21
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,33 @@ Changelog (Pillow)
55
8.0.0 (unreleased)
66
------------------
77

8+
- Fix IFDRational __eq__ bug #4888
9+
[luphord, radarhere]
10+
11+
- Fixed duplicate variable name #4885
12+
[liZe, radarhere]
13+
14+
- Added homebrew zlib include directory #4842
15+
[radarhere]
16+
17+
- Corrected inverted PDF CMYK colors #4866
18+
[radarhere]
19+
20+
- Do not try to close file pointer if file pointer is empty #4823
21+
[radarhere]
22+
23+
- ImageOps.autocontrast: add mask parameter #4843
24+
[navneeth, hugovk]
25+
826
- Read EXIF data tEXt chunk into info as bytes instead of string #4828
927
[radarhere]
1028

1129
- Remove long-deprecated Image.py functions #4798
1230
[hugovk, nulano, radarhere]
1331

32+
- Replaced most uses of distutils with setuptools #4797, #4809, #4814, #4817, #4829
33+
[hugovk, radarhere]
34+
1435
- Add MIME type to PsdImagePlugin #4788
1536
[samamorgan]
1637

‎README.md

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<p align="center">
2+
<img width="248" height="250" src="https://raw.githubusercontent.com/python-pillow/pillow-logo/master/pillow-logo-248x250.png" alt="Pillow logo">
3+
</p>
4+
5+
# Pillow
6+
7+
## Python Imaging Library (Fork)
8+
9+
Pillow is the friendly PIL fork by [Alex Clark and
10+
Contributors](https://github.com/python-pillow/Pillow/graphs/contributors).
11+
PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
12+
As of 2019, Pillow development is
13+
[supported by Tidelift](https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=readme&utm_campaign=enterprise).
14+
15+
<table>
16+
<tr>
17+
<th>docs</th>
18+
<td>
19+
<a href="https://pillow.readthedocs.io/?badge=latest"><img
20+
alt="Documentation Status"
21+
src="https://readthedocs.org/projects/pillow/badge/?version=latest"></a>
22+
</td>
23+
</tr>
24+
<tr>
25+
<th>tests</th>
26+
<td>
27+
<a href="https://travis-ci.org/python-pillow/Pillow"><img
28+
alt="Travis CI build status (Linux)"
29+
src="https://img.shields.io/travis/python-pillow/Pillow/master.svg?label=Linux%20build"></a>
30+
<a href="https://travis-ci.org/python-pillow/pillow-wheels"><img
31+
alt="Travis CI build status (macOS)"
32+
src="https://img.shields.io/travis/python-pillow/pillow-wheels/master.svg?label=macOS%20build"></a>
33+
<a href="https://ci.appveyor.com/project/python-pillow/Pillow"><img
34+
alt="AppVeyor CI build status (Windows)"
35+
src="https://img.shields.io/appveyor/build/python-pillow/Pillow/master.svg?label=Windows%20build"></a>
36+
<a href="https://github.com/python-pillow/Pillow/actions?query=workflow%3ALint"><img
37+
alt="GitHub Actions build status (Lint)"
38+
src="https://github.com/python-pillow/Pillow/workflows/Lint/badge.svg"></a>
39+
<a href="https://github.com/python-pillow/Pillow/actions?query=workflow%3ATest"><img
40+
alt="GitHub Actions build status (Test Linux and macOS)"
41+
src="https://github.com/python-pillow/Pillow/workflows/Test/badge.svg"></a>
42+
<a href="https://github.com/python-pillow/Pillow/actions?query=workflow%3A%22Test+Windows%22"><img
43+
alt="GitHub Actions build status (Test Windows)"
44+
src="https://github.com/python-pillow/Pillow/workflows/Test%20Windows/badge.svg"></a>
45+
<a href="https://github.com/python-pillow/Pillow/actions?query=workflow%3A%22Test+Docker%22"><img
46+
alt="GitHub Actions build status (Test Docker)"
47+
src="https://github.com/python-pillow/Pillow/workflows/Test%20Docker/badge.svg"></a>
48+
<a href="https://codecov.io/gh/python-pillow/Pillow"><img
49+
alt="Code coverage"
50+
src="https://codecov.io/gh/python-pillow/Pillow/branch/master/graph/badge.svg"></a>
51+
</td>
52+
</tr>
53+
<tr>
54+
<th>package</th>
55+
<td>
56+
<a href="https://zenodo.org/badge/latestdoi/17549/python-pillow/Pillow"><img
57+
alt="Zenodo"
58+
src="https://zenodo.org/badge/17549/python-pillow/Pillow.svg"></a>
59+
<a href="https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=badge"><img
60+
alt="Tidelift"
61+
src="https://tidelift.com/badges/package/pypi/Pillow?style=flat"></a>
62+
<a href="https://pypi.org/project/Pillow/"><img
63+
alt="Newest PyPI version"
64+
src="https://img.shields.io/pypi/v/pillow.svg"></a>
65+
<a href="https://pypi.org/project/Pillow/"><img
66+
alt="Number of PyPI downloads"
67+
src="https://img.shields.io/pypi/dm/pillow.svg"></a>
68+
</td>
69+
</tr>
70+
<tr>
71+
<th>social</th>
72+
<td>
73+
<a href="https://gitter.im/python-pillow/Pillow?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"><img
74+
alt="Join the chat at https://gitter.im/python-pillow/Pillow"
75+
src="https://badges.gitter.im/python-pillow/Pillow.svg"></a>
76+
<a href="https://twitter.com/PythonPillow"><img
77+
alt="Follow on https://twitter.com/PythonPillow"
78+
src="https://img.shields.io/badge/tweet-on%20Twitter-00aced.svg"></a>
79+
</td>
80+
</tr>
81+
</table>
82+
83+
## More Information
84+
85+
- [Documentation](https://pillow.readthedocs.io/)
86+
- [Installation](https://pillow.readthedocs.io/en/latest/installation.html)
87+
- [Handbook](https://pillow.readthedocs.io/en/latest/handbook/index.html)
88+
- [Contribute](https://github.com/python-pillow/Pillow/blob/master/.github/CONTRIBUTING.md)
89+
- [Issues](https://github.com/python-pillow/Pillow/issues)
90+
- [Pull requests](https://github.com/python-pillow/Pillow/pulls)
91+
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
92+
- [Pre-fork](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst#pre-fork)
93+
94+
## Report a Vulnerability
95+
96+
To report a security vulnerability, please follow the procedure described in the [Tidelift security policy](https://tidelift.com/docs/security).

‎README.rst

-103
This file was deleted.

‎RELEASING.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,7 @@ Released as needed privately to individual vendors for critical security-related
101101
cd pillow-wheels
102102
./update-pillow-tag.sh [[release tag]]
103103
```
104-
* [ ] Download distributions from the [Pillow Wheel Builder container](http://a365fff413fe338398b6-1c8a9b3114517dc5fe17b7c3f8c63a43.r19.cf2.rackcdn.com/).
105-
```bash
106-
wget -m -A 'Pillow-<VERSION>-*' \
107-
http://a365fff413fe338398b6-1c8a9b3114517dc5fe17b7c3f8c63a43.r19.cf2.rackcdn.com
108-
```
104+
* [ ] Download wheels from the [Pillow Wheel Builder release](https://github.com/python-pillow/pillow-wheels/releases).
109105

110106
## Publicize Release
111107

0 commit comments

Comments
 (0)