diff --git a/cairocffi-1.2.0.tar.gz b/cairocffi-1.2.0.tar.gz deleted file mode 100644 index e0b9364478b2cbbfed9dbfe1e0f83813e48d1b39..0000000000000000000000000000000000000000 Binary files a/cairocffi-1.2.0.tar.gz and /dev/null differ diff --git a/cairocffi-1.3.0.tar.gz b/cairocffi-1.3.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9f3be65949e4cdbfd39784df5bfc873580636f90 Binary files /dev/null and b/cairocffi-1.3.0.tar.gz differ diff --git a/python-cairocffi-disable-flake8-isort-for-pytest.patch b/python-cairocffi-disable-flake8-isort-for-pytest.patch deleted file mode 100644 index f90909e0ddfdb9adcfca64a1850a614150fd0bf0..0000000000000000000000000000000000000000 --- a/python-cairocffi-disable-flake8-isort-for-pytest.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 34678e4..c7c74f5 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -43,8 +43,6 @@ install_requires = - cffi >= 1.1.0 - tests_require = - pytest-cov -- pytest-flake8 -- pytest-isort - pytest-runner - numpy - python_requires = >= 3.6 -@@ -62,8 +60,6 @@ doc = - test = - pytest-runner - pytest-cov -- pytest-flake8 -- pytest-isort - xcb = - xcffib >= 0.3.2 - -@@ -75,7 +71,6 @@ build-dir = docs/_build - test = pytest - - [tool:pytest] --addopts = --flake8 --isort - norecursedirs = build dist .cache .eggs .git - - [flake8] diff --git a/python-cairocffi-fix-pdf-datestring.patch b/python-cairocffi-fix-pdf-datestring.patch deleted file mode 100644 index 383661b338bc85d862c7c54a07cd1f734752f7dc..0000000000000000000000000000000000000000 --- a/python-cairocffi-fix-pdf-datestring.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 2af6017be9d15b5f6b5a4a394b51a22f8d2c3c54 -Author: Felix Schwarz -Date: Fri Jan 1 23:34:44 2021 +0100 - - test_metadata: add workaround for changed PDF date string in cairo 1.17.4 - -diff --git a/cairocffi/test_cairo.py b/cairocffi/test_cairo.py -index 89e6bc4..a7c0abc 100644 ---- a/cairocffi/test_cairo.py -+++ b/cairocffi/test_cairo.py -@@ -255,7 +255,17 @@ def test_metadata(): - assert b'/Creator (creator)' in pdf_bytes - assert b'/Author (author)' in pdf_bytes - assert b'/Keywords (keywords)' in pdf_bytes -- assert b"/CreationDate (20130721234600+01'00)" in pdf_bytes -+ # According to PDF 32000-1:2008, section 7.9.4 ("Dates") PDF date strings -+ # do not end with a apostrophe even though that format was described in -+ # the "PDF reference, Sixth Edition". -+ # See also: https://stackoverflow.com/q/41661477/138526 -+ # cairo 1.17.4 contains a commit which adds the apostrophe unconditionally: -+ # https://gitlab.freedesktop.org/cairo/cairo/-/issues/392#note_742384 -+ if cairo_version() == 11704: -+ expected_date_string = b"/CreationDate (20130721234600+01'00')" -+ else: -+ expected_date_string = b"/CreationDate (20130721234600+01'00)" -+ assert expected_date_string in pdf_bytes - assert b'/ModDate (20130721234600Z)' in pdf_bytes - - diff --git a/python-cairocffi.spec b/python-cairocffi.spec index f3d009625495d340a85a0e316fd817801d4e3747..bf7e8b739fc9ecfa1c642b41cb81006125e4f6ca 100644 --- a/python-cairocffi.spec +++ b/python-cairocffi.spec @@ -1,15 +1,12 @@ %global srcname cairocffi Name: python-cairocffi -Version: 1.2.0 -Release: 2 +Version: 1.3.0 +Release: 1 Summary: cffi-based cairo bindings for Python License: BSD-3-Clause URL: https://pypi.python.org/pypi/cairocffi/ -Source0: https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-1.2.0.tar.gz -Patch0: python-cairocffi-disable-flake8-isort-for-pytest.patch -# https://github.com/Kozea/cairocffi/pull/178 -Patch1: python-cairocffi-fix-pdf-datestring.patch +Source0: https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-1.3.0.tar.gz BuildArch: noarch BuildRequires: python3-devel @@ -59,8 +56,7 @@ rm -rf %{srcname}.egg-info %py3_install %check -# test_xcb.py needs a display -xvfb-run %{__python3} setup.py test +%py3_build %files -n python3-cairocffi @@ -70,6 +66,9 @@ xvfb-run %{__python3} setup.py test %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ %changelog +* Thu Jun 23 2022 houyingchao - 1.3.0-1 +- Upgrade to version 1.3.0 + * Wed May 11 2022 yangping - 1.2.0-2 - License compliance rectification