From dcd5d6e5e676239c36c7833b2d145d4e857b1355 Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Jul 13 2022 20:52:02 +0000 Subject: update to 56.0 --- diff --git a/sources b/sources index 22994c9..2976746 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weasyprint-55.0.tar.gz) = 96cc6de5af86da47aa0b5a84c3f00679690774574f3370ca319afe77f3eb9c9725f3b0a6cbddf589f23f444972bc77b07cce7e27ee2c466484636b3cb30250a3 +SHA512 (weasyprint-56.0.tar.gz) = d8efc83f77967a514d26806a9b73ef03e047431c6db9b367cd23a819b4a68714d216081afc74162b60084d0f3755498dc782d0335069bc9e70c42b611b737eec diff --git a/weasyprint-disable-flake8-isort-for-pytest.patch b/weasyprint-disable-flake8-isort-for-pytest.patch index 1523b96..7e31404 100644 --- a/weasyprint-disable-flake8-isort-for-pytest.patch +++ b/weasyprint-disable-flake8-isort-for-pytest.patch @@ -1,13 +1,13 @@ diff --git a/pyproject.toml b/pyproject.toml -index b7564a4..303fef2 100644 +index 525b571..d16ed08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,7 +61,7 @@ weasyprint = 'weasyprint.__main__:main' exclude = ['.*', 'tests/results'] [tool.pytest.ini_options] --addopts = '--isort --flake8 --cov --no-cov-on-fail' -+addopts = '--cov --no-cov-on-fail' +-addopts = '--isort --flake8 --numprocesses=auto' ++addopts = '--numprocesses=auto' [tool.coverage.run] branch = true diff --git a/weasyprint-fix-otb-test.patch b/weasyprint-fix-otb-test.patch new file mode 100644 index 0000000..4577df7 --- /dev/null +++ b/weasyprint-fix-otb-test.patch @@ -0,0 +1,26 @@ +From 91a2474400103a63d931e4fcf51b3b516bb7b989 Mon Sep 17 00:00:00 2001 +From: Guillaume Ayoub +Date: Wed, 13 Jul 2022 10:23:57 +0200 +Subject: [PATCH] Fix OTB test on Fedora + +The metrics and floats roundings seems to be slightly different on different +platforms. Using a lower line-height value should fix the problem everywhere. + +Fix #1677. +--- + tests/draw/test_text.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/draw/test_text.py b/tests/draw/test_text.py +index b008b15f3..2df85ddb5 100644 +--- a/tests/draw/test_text.py ++++ b/tests/draw/test_text.py +@@ -845,7 +845,7 @@ def test_otb_font(assert_pixels): + color: red; + font-family: weasyprint-otb; + font-size: 4px; +- line-height: 1; ++ line-height: 0.8; + } + + AaA''') diff --git a/weasyprint-remove-dependency-coverage-toml.patch b/weasyprint-remove-dependency-coverage-toml.patch index bb0ff2d..8b054aa 100644 --- a/weasyprint-remove-dependency-coverage-toml.patch +++ b/weasyprint-remove-dependency-coverage-toml.patch @@ -1,13 +1,13 @@ diff --git a/pyproject.toml b/pyproject.toml -index 899e7a6..888daa9 100644 +index 525b571..e5ea967 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ Donation = 'https://opencollective.com/courtbouillon' [project.optional-dependencies] doc = ['sphinx', 'sphinx_rtd_theme'] --test = ['pytest', 'pytest-cov', 'pytest-flake8', 'pytest-isort', 'coverage[toml]'] -+test = ['pytest', 'pytest-cov', 'pytest-flake8', 'pytest-isort'] +-test = ['pytest', 'pytest-xdist', 'pytest-flake8', 'pytest-isort', 'pytest-cov', 'coverage[toml]'] ++test = ['pytest', 'pytest-xdist', 'pytest-flake8', 'pytest-isort', 'pytest-cov'] [project.scripts] weasyprint = 'weasyprint.__main__:main' diff --git a/weasyprint.spec b/weasyprint.spec index 48b49f9..2de79bf 100644 --- a/weasyprint.spec +++ b/weasyprint.spec @@ -2,8 +2,8 @@ %global srcname weasyprint Name: weasyprint -Version: 55.0 -Release: 2%{?dist} +Version: 56.0 +Release: 1%{?dist} Summary: Utility to render HTML and CSS to PDF License: BSD @@ -11,6 +11,7 @@ URL: https://weasyprint.org/ Source0: %pypi_source Patch0: %{name}-disable-flake8-isort-for-pytest.patch Patch1: %{name}-remove-dependency-coverage-toml.patch +Patch99: %{name}-fix-otb-test.patch BuildArch: noarch @@ -76,6 +77,9 @@ rm -rf %{buildroot}%{python3_sitelib}/%{modname}/tests %{python3_sitelib}/%{modname}/ %changelog +* Thu Jul 07 2022 Felix Schwarz - 56.0-1 +- update to 56.0 + * Mon Jun 20 2022 Python Maint - 55.0-2 - Rebuilt for Python 3.11