From 03a898b22e341b5a9745b421b251f3480eeae332 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 19 Nov 2022 14:40:46 +0100 Subject: [PATCH] Update to 1.22.0 --- .gitignore | 1 + pycairo-1.21.0-cairo-1.17.6-tests.patch | 101 ------------------------ pycairo.spec | 9 ++- sources | 2 +- 4 files changed, 7 insertions(+), 106 deletions(-) delete mode 100644 pycairo-1.21.0-cairo-1.17.6-tests.patch diff --git a/.gitignore b/.gitignore index 630c2f8..7ff8702 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ pycairo-1.8.8.tar.gz /pycairo-1.20.0.tar.gz /pycairo-1.20.1.tar.gz /pycairo-1.21.0.tar.gz +/pycairo-1.22.0.tar.gz diff --git a/pycairo-1.21.0-cairo-1.17.6-tests.patch b/pycairo-1.21.0-cairo-1.17.6-tests.patch deleted file mode 100644 index ad78499..0000000 --- a/pycairo-1.21.0-cairo-1.17.6-tests.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 807241feafdd04c2b90c92c86dc4e00bc06a3d33 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 19 Mar 2022 17:36:03 +0100 -Subject: [PATCH 1/3] tests: test passing a font family to ToyFontFace -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The new backend in cairo 1.17.6 has problems with this, but we never -tested this directly on the Python level. - -Śee https://gitlab.freedesktop.org/cairo/cairo/-/issues/544 ---- - tests/test_font.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/test_font.py b/tests/test_font.py -index c4dfa80..5d3e27a 100644 ---- a/tests/test_font.py -+++ b/tests/test_font.py -@@ -204,6 +204,10 @@ def test_toy_font_face(): - def test_toy_font_get_family(): - font_face = cairo.ToyFontFace("") - assert isinstance(font_face.get_family(), str) -+ font_face = cairo.ToyFontFace("serif") -+ assert isinstance(font_face.get_family(), str) -+ font_face = cairo.ToyFontFace("sans-serif") -+ assert isinstance(font_face.get_family(), str) - - - def test_toy_font_get_slant(): - -From 678edd94d8a6dfb5d51f9c3549e6ee8c90a73744 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 19 Mar 2022 17:37:32 +0100 -Subject: [PATCH 2/3] tests: allow a different default document unit for - SVGSurface - -It was changed upstream, despite being documented. - -See https://gitlab.freedesktop.org/cairo/cairo/-/issues/545 ---- - tests/test_surface.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/test_surface.py b/tests/test_surface.py -index 20f1bd4..503bc50 100644 ---- a/tests/test_surface.py -+++ b/tests/test_surface.py -@@ -267,7 +267,10 @@ def test_svg_version_to_string(): - reason="too old cairo") - def test_svg_surface_get_document_unit(): - with cairo.SVGSurface(None, 10, 10) as surface: -- assert surface.get_document_unit() == cairo.SVGUnit.PT -+ # https://gitlab.freedesktop.org/cairo/cairo/-/issues/545 -+ assert surface.get_document_unit() in [cairo.SVGUnit.PT, cairo.SVGUnit.USER] -+ -+ with cairo.SVGSurface(None, 10, 10) as surface: - surface.set_document_unit(cairo.SVGUnit.PX) - assert surface.get_document_unit() == cairo.SVGUnit.PX - with pytest.raises(cairo.Error): - -From 843e3db002e8d114362e6714babfffc400dbe4c0 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 19 Mar 2022 18:10:53 +0100 -Subject: [PATCH 3/3] CI: add a special hypothesis settings profile for CI - -Increase the deadline and run more tests ---- - tests/test_hypothesis.py | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/tests/test_hypothesis.py b/tests/test_hypothesis.py -index 80ebb5b..c76bc31 100644 ---- a/tests/test_hypothesis.py -+++ b/tests/test_hypothesis.py -@@ -17,6 +17,16 @@ - from .hypothesis_fspaths import fspaths - - -+if "CI" in os.environ: -+ # CI can be slow, so be patient -+ # Also we can run more tests there -+ settings.register_profile( -+ "ci", -+ deadline=settings.default.deadline * 5, -+ max_examples=settings.default.max_examples * 5) -+ settings.load_profile("ci") -+ -+ - @pytest.fixture(scope='module') - def tempdir_path(): - dir_ = tempfile.mkdtemp() -@@ -44,7 +54,6 @@ def cairo_ver(): - platform.python_implementation() == "PyPy" and sys.pypy_version_info < (7, 3, 0), - reason="PyPy bugs") - @given(path=fspaths()) --@settings(max_examples=500) - def test_fspaths(tempdir_path, path): - p = _to_temp_path(tempdir_path, path) - diff --git a/pycairo.spec b/pycairo.spec index 03a965f..ce75f7f 100644 --- a/pycairo.spec +++ b/pycairo.spec @@ -1,13 +1,11 @@ Name: pycairo -Version: 1.21.0 -Release: 3%{?dist} +Version: 1.22.0 +Release: 1%{?dist} Summary: Python bindings for the cairo library License: MPLv1.1 or LGPLv2 URL: https://www.cairographics.org/pycairo Source0: https://github.com/pygobject/pycairo/releases/download/v%{version}/pycairo-%{version}.tar.gz -# https://github.com/pygobject/pycairo/pull/264 -Patch0: pycairo-1.21.0-cairo-1.17.6-tests.patch BuildRequires: pkgconfig(cairo) BuildRequires: gcc @@ -58,6 +56,9 @@ libraries so that they interoperate with py3cairo. %{_libdir}/pkgconfig/py3cairo.pc %changelog +* Sat Nov 19 2022 Kalev Lember - 1.22.0-1 +- Update to 1.22.0 + * Fri Jul 22 2022 Fedora Release Engineering - 1.21.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index cc84c67..c6419ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pycairo-1.21.0.tar.gz) = 0de226b05d0a358f3546e4a0d5bf342f124373718d4900c891a09c1ede11e3ed1fb9bee163c00acfc215044683ddf0b29c8573b7454f9c39f957a47d63c34baf +SHA512 (pycairo-1.22.0.tar.gz) = 2a8da5b905536291291655a237fd0c6c54a5fe91a38296cffdc187c0c35837bd3176045f4ab39e59e7f67947deba7ba076c5e6ffdb46256b4b180c42267f41b6