Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Remove soon-EOL Amazon Linux 1 and CentOS 6 #5060

Merged
merged 5 commits into from
Nov 30, 2020
Merged

CI: Remove soon-EOL Amazon Linux 1 and CentOS 6 #5060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e377d24
Remove soon-EOL Amazon Linux 1 and CentOS 6
hugovk Nov 24, 2020
5abdbe1
Sort for easier reference
hugovk Nov 24, 2020
74048f9
remove FT 2.3 from tests
nulano Nov 25, 2020
86993df
remove duplicate values
nulano Nov 25, 2020
b129902
Merge pull request #63 from nulano/ft-eol
hugovk Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/test-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,15 @@ jobs:
matrix:
docker: [
alpine,
amazon-2-amd64,
arch,
ubuntu-18.04-bionic-amd64,
ubuntu-20.04-focal-amd64,
debian-10-buster-x86,
centos-6-amd64,
centos-7-amd64,
centos-8-amd64,
amazon-1-amd64,
amazon-2-amd64,
debian-10-buster-x86,
fedora-32-amd64,
fedora-33-amd64,
ubuntu-18.04-bionic-amd64,
ubuntu-20.04-focal-amd64,
]
dockerTag: [master]

Expand Down
36 changes: 7 additions & 29 deletions Tests/test_imagefont.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,8 @@ class TestImageFont:
# Freetype has different metrics depending on the version.
# (and, other things, but first things first)
METRICS = {
(">=2.3", "<2.4"): {
"multiline": 30,
"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),
},
(">=2.7",): {"multiline": 6.2, "textsize": 2.5, "getlength": (36, 21, 24, 33)},
"Default": {"multiline": 0.5, "textsize": 0.5, "getlength": (36, 24, 24, 33)},
}

@classmethod
Expand Down Expand Up @@ -395,7 +373,7 @@ def test_rotated_transposed_font_get_mask(self):
mask = transposed_font.getmask(text)

# Assert
assert mask.size == self.metrics["mask"][::-1]
assert mask.size == (13, 108)

def test_unrotated_transposed_font_get_mask(self):
# Arrange
Expand All @@ -408,7 +386,7 @@ def test_unrotated_transposed_font_get_mask(self):
mask = transposed_font.getmask(text)

# Assert
assert mask.size == self.metrics["mask"]
assert mask.size == (108, 13)

def test_free_type_font_get_name(self):
# Arrange
Expand Down Expand Up @@ -452,7 +430,7 @@ def test_free_type_font_get_mask(self):
mask = font.getmask(text)

# Assert
assert mask.size == self.metrics["mask"]
assert mask.size == (108, 13)

def test_load_path_not_found(self):
# Arrange
Expand Down Expand Up @@ -633,7 +611,7 @@ def test_imagefont_getters(self):
assert t.font.glyphs == 4177
assert t.getsize("A") == (12, 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("a") == (12, 16)
assert t.getsize_multiline("A") == (12, 16)
Expand Down Expand Up @@ -869,7 +847,7 @@ def test_anchor_multiline(self, anchor, align):
)

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):
font = self.get_font()
Expand Down
4 changes: 0 additions & 4 deletions docs/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,12 +422,8 @@ These platforms are built and tested for every change.
+----------------------------------+--------------------------+-----------------------+
| Arch | 3.8 |x86-64 |
+----------------------------------+--------------------------+-----------------------+
| Amazon Linux 1 | 3.6 |x86-64 |
+----------------------------------+--------------------------+-----------------------+
| Amazon Linux 2 | 3.7 |x86-64 |
+----------------------------------+--------------------------+-----------------------+
| CentOS 6 | 3.6 |x86-64 |
+----------------------------------+--------------------------+-----------------------+
| CentOS 7 | 3.6 |x86-64 |
+----------------------------------+--------------------------+-----------------------+
| CentOS 8 | 3.6 |x86-64 |
Expand Down