Merge pull request #5060 from hugovk/rm-eol

CI: Remove soon-EOL Amazon Linux 1 and CentOS 6
python-pillow · Nov 30, 2020 · 619a7b9 · 619a7b9
2 parents 78fd274 + b129902
commit 619a7b9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 39 deletions.
diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
@@ -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]
 

diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -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()

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -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                 |