!5 update to version 1.3.0
From: @wang--ge Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
92a2b9ceae
42
0001-fix-test-case-due-to-pytest-module-defected.patch
Normal file
42
0001-fix-test-case-due-to-pytest-module-defected.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
From e53fa1d571dcb48eb5aeef5a48393fd877b3631a Mon Sep 17 00:00:00 2001
|
||||||
|
From: wang--ge <wang__ge@126.com>
|
||||||
|
Date: Mon, 17 Oct 2022 11:40:56 +0800
|
||||||
|
Subject: [PATCH] fix test case due to pytest module defected
|
||||||
|
|
||||||
|
---
|
||||||
|
setup.cfg | 5 -----
|
||||||
|
1 file changed, 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/setup.cfg b/setup.cfg
|
||||||
|
index 6ab6258..27cd86e 100644
|
||||||
|
--- a/setup.cfg
|
||||||
|
+++ b/setup.cfg
|
||||||
|
@@ -42,8 +42,6 @@ install_requires =
|
||||||
|
cffi >= 1.1.0
|
||||||
|
tests_require =
|
||||||
|
pytest-cov
|
||||||
|
- pytest-flake8
|
||||||
|
- pytest-isort
|
||||||
|
pytest-runner
|
||||||
|
numpy
|
||||||
|
python_requires = >= 3.7
|
||||||
|
@@ -61,8 +59,6 @@ doc =
|
||||||
|
test =
|
||||||
|
pytest-runner
|
||||||
|
pytest-cov
|
||||||
|
- pytest-flake8
|
||||||
|
- pytest-isort
|
||||||
|
xcb =
|
||||||
|
xcffib >= 0.3.2
|
||||||
|
|
||||||
|
@@ -74,7 +70,6 @@ build-dir = docs/_build
|
||||||
|
test = pytest
|
||||||
|
|
||||||
|
[tool:pytest]
|
||||||
|
-addopts = --flake8 --isort
|
||||||
|
norecursedirs = build dist .cache .eggs .git
|
||||||
|
|
||||||
|
[flake8]
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
Binary file not shown.
BIN
cairocffi-1.3.0.tar.gz
Normal file
BIN
cairocffi-1.3.0.tar.gz
Normal file
Binary file not shown.
@ -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]
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
commit 2af6017be9d15b5f6b5a4a394b51a22f8d2c3c54
|
|
||||||
Author: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,15 +1,13 @@
|
|||||||
%global srcname cairocffi
|
%global srcname cairocffi
|
||||||
|
|
||||||
Name: python-cairocffi
|
Name: python-cairocffi
|
||||||
Version: 1.2.0
|
Version: 1.3.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: cffi-based cairo bindings for Python
|
Summary: cffi-based cairo bindings for Python
|
||||||
License: BSD
|
License: BSD-3-Clause
|
||||||
URL: https://pypi.python.org/pypi/cairocffi/
|
URL: https://pypi.python.org/pypi/cairocffi/
|
||||||
Source0: https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-1.2.0.tar.gz
|
Source0: https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-%{version}.tar.gz
|
||||||
Patch0: python-cairocffi-disable-flake8-isort-for-pytest.patch
|
Patch1: 0001-fix-test-case-due-to-pytest-module-defected.patch
|
||||||
# https://github.com/Kozea/cairocffi/pull/178
|
|
||||||
Patch1: python-cairocffi-fix-pdf-datestring.patch
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
@ -25,6 +23,7 @@ BuildRequires: python3-numpy
|
|||||||
BuildRequires: gdk-pixbuf2
|
BuildRequires: gdk-pixbuf2
|
||||||
BuildRequires: gdk-pixbuf2-modules
|
BuildRequires: gdk-pixbuf2-modules
|
||||||
BuildRequires: xorg-x11-server-Xvfb
|
BuildRequires: xorg-x11-server-Xvfb
|
||||||
|
BuildRequires: python3-isort
|
||||||
|
|
||||||
%global _description\
|
%global _description\
|
||||||
cairocffi is a CFFI-based drop-in replacement for Pycairo, a set of\
|
cairocffi is a CFFI-based drop-in replacement for Pycairo, a set of\
|
||||||
@ -70,5 +69,8 @@ xvfb-run %{__python3} setup.py test
|
|||||||
%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/
|
%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 17 2022 Ge Wang<wangge20@h-partners.com> 1.3.0-1
|
||||||
|
- Upgrade to version 1.3.0
|
||||||
|
|
||||||
* Fri Feb 19 2021 Ge Wang<wangge20@huawei.com> - 1.2.0-1
|
* Fri Feb 19 2021 Ge Wang<wangge20@huawei.com> - 1.2.0-1
|
||||||
- Init package
|
- Init package
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user