From 362ac06fb238fd1b24bf3dcab42a004e1211742c64d57f9ffd06743e91755240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 29 Apr 2024 13:25:06 +0000 Subject: [PATCH] Accepting request 1170672 from home:jubalh:branches:devel:languages:python - Update to 1.7.0: * Drop Python 3.7 support, add Python 3.12 support * #221: Add environment variable to set folder where DLLs are installed on Windows * #225: Use Ruff instead of Flake8 and isort - Refresh skip-pikepdf.patch OBS-URL: https://build.opensuse.org/request/show/1170672 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cairocffi?expand=0&rev=58 --- cairocffi-1.6.1.tar.gz | 3 --- cairocffi-1.7.0.tar.gz | 3 +++ python-cairocffi.changes | 10 ++++++++++ python-cairocffi.spec | 6 +++--- skip-pikepdf.patch | 22 +++++++++++----------- 5 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 cairocffi-1.6.1.tar.gz create mode 100644 cairocffi-1.7.0.tar.gz diff --git a/cairocffi-1.6.1.tar.gz b/cairocffi-1.6.1.tar.gz deleted file mode 100644 index 78ba00c..0000000 --- a/cairocffi-1.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78e6bbe47357640c453d0be929fa49cd05cce2e1286f3d2a1ca9cbda7efdb8b7 -size 87436 diff --git a/cairocffi-1.7.0.tar.gz b/cairocffi-1.7.0.tar.gz new file mode 100644 index 0000000..a59c355 --- /dev/null +++ b/cairocffi-1.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7761863603894305f3160eca68452f373433ca8745ab7dd445bd2c6ce50dcab7 +size 87840 diff --git a/python-cairocffi.changes b/python-cairocffi.changes index e3b5a2b..d525100 100644 --- a/python-cairocffi.changes +++ b/python-cairocffi.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Apr 29 06:52:06 UTC 2024 - Michael Vetter + +- Update to 1.7.0: + * Drop Python 3.7 support, add Python 3.12 support + * #221: Add environment variable to set folder where DLLs are + installed on Windows + * #225: Use Ruff instead of Flake8 and isort +- Refresh skip-pikepdf.patch + ------------------------------------------------------------------- Thu Oct 19 13:30:28 UTC 2023 - Soc Virnyl Estela diff --git a/python-cairocffi.spec b/python-cairocffi.spec index 2831f6d..e9712e4 100644 --- a/python-cairocffi.spec +++ b/python-cairocffi.spec @@ -1,7 +1,7 @@ # # spec file for package python-cairocffi # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-cairocffi -Version: 1.6.1 +Version: 1.7.0 Release: 0 Summary: Python cairo bindings based on cffi License: BSD-3-Clause @@ -27,7 +27,7 @@ URL: https://github.com/Kozea/cairocffi Source: https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-%{version}.tar.gz # avoid pikepdf in Ring1, skipping the pikepdf related tests Patch1: skip-pikepdf.patch -BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module cffi >= 1.1.0} BuildRequires: %{python_module flit-core} BuildRequires: %{python_module pip} diff --git a/skip-pikepdf.patch b/skip-pikepdf.patch index 2c04755..4d03508 100644 --- a/skip-pikepdf.patch +++ b/skip-pikepdf.patch @@ -1,16 +1,16 @@ -Index: cairocffi-1.5.1/cairocffi/test_cairo.py +Index: cairocffi-1.7.0/cairocffi/test_cairo.py =================================================================== ---- cairocffi-1.5.1.orig/cairocffi/test_cairo.py -+++ cairocffi-1.5.1/cairocffi/test_cairo.py -@@ -21,7 +21,6 @@ import sys +--- cairocffi-1.7.0.orig/cairocffi/test_cairo.py ++++ cairocffi-1.7.0/cairocffi/test_cairo.py +@@ -20,7 +20,6 @@ import shutil + import sys import tempfile - import cairocffi -import pikepdf import pytest - from . import ( -@@ -239,6 +238,7 @@ def test_device_scale(): + import cairocffi +@@ -240,6 +239,7 @@ def test_device_scale(): @pytest.mark.xfail(cairo_version() < 11504, reason='Cairo version too low') @@ -18,7 +18,7 @@ Index: cairocffi-1.5.1/cairocffi/test_cairo.py def test_metadata(): file_obj = io.BytesIO() surface = PDFSurface(file_obj, 1, 1) -@@ -264,6 +264,7 @@ def test_metadata(): +@@ -265,6 +265,7 @@ def test_metadata(): @pytest.mark.xfail(cairo_version() < 11504, reason='Cairo version too low') @@ -26,7 +26,7 @@ Index: cairocffi-1.5.1/cairocffi/test_cairo.py def test_outline(): file_obj = io.BytesIO() surface = PDFSurface(file_obj, 1, 1) -@@ -280,6 +281,7 @@ def test_outline(): +@@ -281,6 +282,7 @@ def test_outline(): @pytest.mark.xfail(cairo_version() < 11504, reason='Cairo version too low') @@ -34,7 +34,7 @@ Index: cairocffi-1.5.1/cairocffi/test_cairo.py def test_page_label(): file_obj = io.BytesIO() surface = PDFSurface(file_obj, 1, 1) -@@ -291,6 +293,7 @@ def test_page_label(): +@@ -292,6 +294,7 @@ def test_page_label(): @pytest.mark.xfail(cairo_version() < 11504, reason='Cairo version too low') @@ -42,7 +42,7 @@ Index: cairocffi-1.5.1/cairocffi/test_cairo.py def test_tag(): file_obj = io.BytesIO() surface = PDFSurface(file_obj, 10, 10) -@@ -419,6 +422,7 @@ def test_pdf_versions(): +@@ -420,6 +423,7 @@ def test_pdf_versions(): assert file_obj.getvalue().startswith(b'%PDF-1.4')