diff --git a/sources b/sources index 4008ca2..5d10b5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weasyprint-69.0.tar.gz) = fb56d7f6173f8a67f8ef4c31408c03625b0a774d0efde003f779e3da054737c88afe9f44ee40b6dda5fc92cfacfa5709d4d96bf1a112862d309eaf2d93881ef6 +SHA512 (weasyprint-58.1.tar.gz) = 75a3512ce02551c2e8247cf7982d3db683c8aef92215e5b4584ca20d5e3f6a4603c65f98e8fcf513b8aff82ebedf221da7dd243e344c9d3626eaa7907fdbd5c2 diff --git a/weasyprint-make-tests-pass-with-pydyf-06.patch b/weasyprint-make-tests-pass-with-pydyf-06.patch new file mode 100644 index 0000000..5632181 --- /dev/null +++ b/weasyprint-make-tests-pass-with-pydyf-06.patch @@ -0,0 +1,173 @@ +From e49d9555090ecec4f76b31f7beba18975f471211 Mon Sep 17 00:00:00 2001 +From: Guillaume Ayoub +Date: Tue, 21 Mar 2023 14:58:47 +0100 +Subject: [PATCH] Make tests pass with pydyf 0.6.0 + +--- + docs/first_steps.rst | 2 +- + pyproject.toml | 2 +- + tests/test_pdf.py | 40 ++++++++++++++++++++-------------------- + 3 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/docs/first_steps.rst b/docs/first_steps.rst +index 85c3ec857..e2aacefe8 100644 +--- a/docs/first_steps.rst ++++ b/docs/first_steps.rst +@@ -11,7 +11,7 @@ WeasyPrint |version| depends on: + + * Python_ ≥ 3.7.0 + * Pango_ ≥ 1.44.0 +-* pydyf_ ≥ 0.5.0 ++* pydyf_ ≥ 0.6.0 + * CFFI_ ≥ 0.6 + * html5lib_ ≥ 1.1 + * tinycss2_ ≥ 1.0.0 +diff --git a/pyproject.toml b/pyproject.toml +index 1c1495473..570aef8af 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -12,7 +12,7 @@ requires-python = '>=3.7' + readme = {file = 'README.rst', content-type = 'text/x-rst'} + license = {file = 'LICENSE'} + dependencies = [ +- 'pydyf >=0.5.0', ++ 'pydyf >=0.6.0', + 'cffi >=0.6', + 'html5lib >=1.1', + 'tinycss2 >=1.0.0', +diff --git a/tests/test_pdf.py b/tests/test_pdf.py +index 3bcc360ac..3d4dcdd0a 100644 +--- a/tests/test_pdf.py ++++ b/tests/test_pdf.py +@@ -26,7 +26,7 @@ + def test_page_size_zoom(zoom): + pdf = FakeHTML(string=' + test + ''' % style).write_pdf() +- assert '/MediaBox [ {} {} {} {} ]'.format(*media).encode() in pdf +- assert '/BleedBox [ {} {} {} {} ]'.format(*bleed).encode() in pdf +- assert '/TrimBox [ {} {} {} {} ]'.format(*trim).encode() in pdf ++ assert '/MediaBox [{} {} {} {}]'.format(*media).encode() in pdf ++ assert '/BleedBox [{} {} {} {}]'.format(*bleed).encode() in pdf ++ assert '/TrimBox [{} {} {} {}]'.format(*trim).encode() in pdf diff --git a/weasyprint.spec b/weasyprint.spec index d5a01df..db91b32 100644 --- a/weasyprint.spec +++ b/weasyprint.spec @@ -2,13 +2,15 @@ %global srcname weasyprint Name: weasyprint -Version: 69.0 +Version: 58.1 Release: 2%{?dist} Summary: Utility to render HTML and CSS to PDF License: BSD-3-Clause -URL: https://weasyprint.org -Source0: %{pypi_source weasyprint} +URL: https://weasyprint.org/ +Source0: %pypi_source +# commit present in upstream git for WeasyPrint 59+ +Patch0: %{name}-make-tests-pass-with-pydyf-06.patch BuildArch: noarch @@ -16,15 +18,12 @@ BuildRequires: python3-devel BuildRequires: pyproject-rpm-macros # used as "build-backend" in pyproject.toml but not detected by Fedora's # macros to generate build requirements -BuildRequires: python3dist(flit-core) +BuildRequires: python3-flit # requirements for testing BuildRequires: dejavu-fonts-all -BuildRequires: google-noto-emoji-fonts BuildRequires: ghostscript # https://doc.courtbouillon.org/weasyprint/latest/first_steps.html BuildRequires: pango >= 1.44.0 -BuildRequires: python3dist(pytest) -BuildRequires: python3dist(pytest-xdist) Requires: python3-weasyprint = %{version}-%{release} @@ -52,7 +51,7 @@ can export to PDF. It aims to support web standards for printing. %autosetup -p1 -n %{srcname}-%{version} %generate_buildrequires -%pyproject_buildrequires -r +%pyproject_buildrequires -r -x test %build %pyproject_wheel @@ -61,7 +60,7 @@ can export to PDF. It aims to support web standards for printing. %pyproject_install %check -%pytest -n auto +%pytest # do not ship tests rm -rf %{buildroot}%{python3_sitelib}/%{modname}/tests @@ -77,105 +76,6 @@ rm -rf %{buildroot}%{python3_sitelib}/%{modname}/tests %{python3_sitelib}/%{modname}/ %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 69.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Thu Jun 11 2026 Felix Schwarz - 69.0-1 -- update to 69.0 - -* Fri Jun 05 2026 Python Maint - 68.1-2 -- Rebuilt for Python 3.15 - -* Sat Feb 07 2026 Felix Schwarz - 68.1-1 -- update to 68.1 - -* Tue Jan 20 2026 Felix Schwarz - 68.0-1 -- update to 68.0 - -* Sat Jan 17 2026 Fedora Release Engineering - 67.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Dec 03 2025 Felix Schwarz - 67.0-1 -- update to 67.0 - -* Fri Sep 19 2025 Python Maint - 66.0-3 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 66.0-2 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Mon Jul 28 2025 Felix Schwarz - 66.0-1 -- update to 66.0 - -* Fri Jul 25 2025 Fedora Release Engineering - 65.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 03 2025 Python Maint - 65.1-2 -- Rebuilt for Python 3.14 - -* Mon Apr 14 2025 Felix Schwarz - 65.1-1 -- update to 65.1 - -* Sun Mar 23 2025 Felix Schwarz - 65.0-1 -- update to 65.0 - -* Wed Mar 05 2025 Felix Schwarz - 64.1-1 -- update to 64.1 - -* Thu Jan 30 2025 Felix Schwarz - 64.0-1 -- update to 64.0 - -* Sun Jan 19 2025 Fedora Release Engineering - 63.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jan 11 2025 Felix Schwarz - 63.1-1 -- update to 63.1 - -* Sat Jul 20 2024 Fedora Release Engineering - 62.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 24 2024 Felix Schwarz - 62.3-1 -- update to 62.3 - -* Sat Jun 08 2024 Python Maint - 62.2-2 -- Rebuilt for Python 3.13 - -* Tue Jun 04 2024 Felix Schwarz - 62.2-1 -- update to 62.2 - -* Mon May 06 2024 Felix Schwarz - 62.1-1 -- update to 62.1 - -* Thu May 02 2024 Felix Schwarz - 62.0-1 -- update to 62.0 - -* Sat Mar 09 2024 Felix Schwarz - 61.2-1 -- update to 61.2 - -* Mon Feb 26 2024 Felix Schwarz - 61.1-1 -- update to 61.1 - -* Mon Feb 12 2024 Felix Schwarz - 61.0-1 -- update to 61.0 - -* Thu Jan 25 2024 Felix Schwarz - 60.2-2 -- use just flit-core as build dependency - -* Tue Dec 12 2023 Felix Schwarz - 60.2-1 -- update to 60.2 - -* Thu Oct 05 2023 Felix Schwarz - 60.1-1 -- update to 60.1 - -* Sat Jul 22 2023 Fedora Release Engineering - 59.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Jul 09 2023 Felix Schwarz - 59.0-2 -- add patch so the test suite passes for Python 3.12 - -* Thu May 11 2023 Felix Schwarz - 59.0-1 -- update to 59.0 - * Sat Apr 15 2023 Felix Schwarz - 58.1-2 - SPDX migration - make tests pass with pydyf 0.6