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

Jump to bottom

Replace distutils.version with packaging.version.parse #4797

Merged
merged 1 commit into from
Jul 18, 2020
Merged

Replace distutils.version with packaging.version.parse #4797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions Tests/test_imagefont.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import copy
import distutils.version
import os
import re
import shutil
import sys
from io import BytesIO

import pytest
from packaging.version import parse as parse_version
from PIL import Image, ImageDraw, ImageFont, features

from .helper import (
Expand Down Expand Up @@ -41,15 +41,15 @@ class TestImageFont:

@classmethod
def setup_class(self):
freetype = distutils.version.StrictVersion(features.version_module("freetype2"))
freetype = parse_version(features.version_module("freetype2"))

self.metrics = self.METRICS["Default"]
for conditions, metrics in self.METRICS.items():
if not isinstance(conditions, tuple):
continue

for condition in conditions:
version = re.sub("[<=>]", "", condition)
version = parse_version(re.sub("[<=>]", "", condition))
if (condition.startswith(">=") and freetype >= version) or (
condition.startswith("<") and freetype < version
):
Expand Down Expand Up @@ -620,8 +620,8 @@ def test_complex_font_settings(self):
def test_variation_get(self):
font = self.get_font()

freetype = distutils.version.StrictVersion(features.version_module("freetype2"))
if freetype < "2.9.1":
freetype = parse_version(features.version_module("freetype2"))
if freetype < parse_version("2.9.1"):
with pytest.raises(NotImplementedError):
font.get_variation_names()
with pytest.raises(NotImplementedError):
Expand Down Expand Up @@ -692,8 +692,8 @@ def _check_text(self, font, path, epsilon):
def test_variation_set_by_name(self):
font = self.get_font()

freetype = distutils.version.StrictVersion(features.version_module("freetype2"))
if freetype < "2.9.1":
freetype = parse_version(features.version_module("freetype2"))
if freetype < parse_version("2.9.1"):
with pytest.raises(NotImplementedError):
font.set_variation_by_name("Bold")
return
Expand All @@ -716,8 +716,8 @@ def test_variation_set_by_name(self):
def test_variation_set_by_axes(self):
font = self.get_font()

freetype = distutils.version.StrictVersion(features.version_module("freetype2"))
if freetype < "2.9.1":
freetype = parse_version(features.version_module("freetype2"))
if freetype < parse_version("2.9.1"):
with pytest.raises(NotImplementedError):
font.set_variation_by_axes([100])
return
Expand All @@ -742,7 +742,7 @@ class TestImageFont_RaqmLayout(TestImageFont):
def test_render_mono_size():
# issue 4177

if distutils.version.StrictVersion(ImageFont.core.freetype2_version) < "2.4":
if parse_version(ImageFont.core.freetype2_version) < parse_version("2.4"):
pytest.skip("Different metrics")

im = Image.new("P", (100, 30), "white")
Expand Down