python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 18:56:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5060 from hugovk/rm-eol

Browse Source 
CI: Remove soon-EOL Amazon Linux 1 and CentOS 6
This commit is contained in:
Andrew Murray 2020-12-01 00:01:07 +11:00 committed by GitHub
commit 619a7b9f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/test-docker.yml vendored
View File

@ -11,17 +11,15 @@ jobs:
matrix: matrix:
docker: [ docker: [
alpine, alpine,
amazon-2-amd64,
arch, arch,
ubuntu-18.04-bionic-amd64,
ubuntu-20.04-focal-amd64,
debian-10-buster-x86,
centos-6-amd64,
centos-7-amd64, centos-7-amd64,
centos-8-amd64, centos-8-amd64,
amazon-1-amd64, debian-10-buster-x86,
amazon-2-amd64,
fedora-32-amd64, fedora-32-amd64,
fedora-33-amd64, fedora-33-amd64,
ubuntu-18.04-bionic-amd64,
ubuntu-20.04-focal-amd64,
] ]
dockerTag: [master] dockerTag: [master]

36
Tests/test_imagefont.py
View File

@ -35,30 +35,8 @@ class TestImageFont:
# Freetype has different metrics depending on the version. # Freetype has different metrics depending on the version.
# (and, other things, but first things first) # (and, other things, but first things first)
METRICS = { METRICS = {
(">=2.3", "<2.4"): { (">=2.7",): {"multiline": 6.2, "textsize": 2.5, "getlength": (36, 21, 24, 33)},
"multiline": 30, "Default": {"multiline": 0.5, "textsize": 0.5, "getlength": (36, 24, 24, 33)},
"textsize": 12,
"getters": (13, 16),
"mask": (107, 13),
"multiline-anchor": 6,
"getlength": (36, 27, 27, 33),
},
(">=2.7",): {
"multiline": 6.2,
"textsize": 2.5,
"getters": (12, 16),
"mask": (108, 13),
"multiline-anchor": 4,
"getlength": (36, 21, 24, 33),
},
"Default": {
"multiline": 0.5,
"textsize": 0.5,
"getters": (12, 16),
"mask": (108, 13),
"multiline-anchor": 4,
"getlength": (36, 24, 24, 33),
},
} }
@classmethod @classmethod
@ -395,7 +373,7 @@ class TestImageFont:
mask = transposed_font.getmask(text) mask = transposed_font.getmask(text)
# Assert # Assert
assert mask.size == self.metrics["mask"][::-1] assert mask.size == (13, 108)
def test_unrotated_transposed_font_get_mask(self): def test_unrotated_transposed_font_get_mask(self):
# Arrange # Arrange
@ -408,7 +386,7 @@ class TestImageFont:
mask = transposed_font.getmask(text) mask = transposed_font.getmask(text)
# Assert # Assert
assert mask.size == self.metrics["mask"] assert mask.size == (108, 13)
def test_free_type_font_get_name(self): def test_free_type_font_get_name(self):
# Arrange # Arrange
@ -452,7 +430,7 @@ class TestImageFont:
mask = font.getmask(text) mask = font.getmask(text)
# Assert # Assert
assert mask.size == self.metrics["mask"] assert mask.size == (108, 13)
def test_load_path_not_found(self): def test_load_path_not_found(self):
# Arrange # Arrange
@ -633,7 +611,7 @@ class TestImageFont:
assert t.font.glyphs == 4177 assert t.font.glyphs == 4177
assert t.getsize("A") == (12, 16) assert t.getsize("A") == (12, 16)
assert t.getsize("AB") == (24, 16) assert t.getsize("AB") == (24, 16)
assert t.getsize("M") == self.metrics["getters"] assert t.getsize("M") == (12, 16)
assert t.getsize("y") == (12, 20) assert t.getsize("y") == (12, 20)
assert t.getsize("a") == (12, 16) assert t.getsize("a") == (12, 16)
assert t.getsize_multiline("A") == (12, 16) assert t.getsize_multiline("A") == (12, 16)
@ -869,7 +847,7 @@ class TestImageFont:
) )
with Image.open(target) as expected: with Image.open(target) as expected:
assert_image_similar(im, expected, self.metrics["multiline-anchor"]) assert_image_similar(im, expected, 4)
def test_anchor_invalid(self): def test_anchor_invalid(self):
font = self.get_font() font = self.get_font()

4
docs/installation.rst
View File

@ -422,12 +422,8 @@ These platforms are built and tested for every change.
+----------------------------------+--------------------------+-----------------------+ +----------------------------------+--------------------------+-----------------------+
| Arch | 3.8 |x86-64 | | Arch | 3.8 |x86-64 |
+----------------------------------+--------------------------+-----------------------+ +----------------------------------+--------------------------+-----------------------+
| Amazon Linux 1 | 3.6 |x86-64 |
+----------------------------------+--------------------------+-----------------------+
| Amazon Linux 2 | 3.7 |x86-64 | | Amazon Linux 2 | 3.7 |x86-64 |
+----------------------------------+--------------------------+-----------------------+ +----------------------------------+--------------------------+-----------------------+
| CentOS 6 | 3.6 |x86-64 |
+----------------------------------+--------------------------+-----------------------+
| CentOS 7 | 3.6 |x86-64 | | CentOS 7 | 3.6 |x86-64 |
+----------------------------------+--------------------------+-----------------------+ +----------------------------------+--------------------------+-----------------------+
| CentOS 8 | 3.6 |x86-64 | | CentOS 8 | 3.6 |x86-64 |