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 afb4465..0000000 --- a/python-cairocffi-disable-flake8-isort-for-pytest.patch +++ /dev/null @@ -1,30 +0,0 @@ -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] diff --git a/python-cairocffi-disable-linters.patch b/python-cairocffi-disable-linters.patch new file mode 100644 index 0000000..cdd7a00 --- /dev/null +++ b/python-cairocffi-disable-linters.patch @@ -0,0 +1,41 @@ +diff --git a/setup.cfg b/setup.cfg +index 6ab6258..5ff9032 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -36,15 +36,11 @@ project_urls = + packages = find: + setup_requires = + cffi >= 1.1.0 +- pytest-runner + setuptools + install_requires = + cffi >= 1.1.0 + tests_require = +- pytest-cov +- pytest-flake8 +- pytest-isort +- pytest-runner ++ pytest + numpy + python_requires = >= 3.7 + +@@ -59,10 +55,7 @@ doc = + sphinx + sphinx_rtd_theme + test = +- pytest-runner +- pytest-cov +- pytest-flake8 +- pytest-isort ++ pytest + xcb = + xcffib >= 0.3.2 + +@@ -74,7 +67,6 @@ build-dir = docs/_build + test = pytest + + [tool:pytest] +-addopts = --flake8 --isort + norecursedirs = build dist .cache .eggs .git + + [flake8] diff --git a/python-cairocffi.spec b/python-cairocffi.spec index 866f766..78d64ed 100644 --- a/python-cairocffi.spec +++ b/python-cairocffi.spec @@ -2,12 +2,12 @@ Name: python-cairocffi Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: cffi-based cairo bindings for Python License: BSD URL: https://pypi.python.org/pypi/cairocffi/ Source0: %{pypi_source} -Patch0: python-cairocffi-disable-flake8-isort-for-pytest.patch +Patch0: python-cairocffi-disable-linters.patch BuildArch: noarch @@ -15,8 +15,6 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-cffi >= 1.1.0 BuildRequires: python3-pytest -BuildRequires: python3-pytest-cov -BuildRequires: python3-pytest-runner BuildRequires: python3-xcffib >= 0.3.2 BuildRequires: cairo-devel # required to run the test suite @@ -59,7 +57,8 @@ rm -rf %{srcname}.egg-info %check # test_xcb.py needs a display -xvfb-run %{__python3} setup.py test +%global __pytest xvfb-run /usr/bin/pytest +%pytest -v --pyargs cairocffi %files -n python3-cairocffi @@ -69,6 +68,9 @@ xvfb-run %{__python3} setup.py test %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ %changelog +* Mon Jun 06 2022 Miro HronĨok - 1.3.0-3 +- Drop some unneeded build time dependencies + * Fri Jan 21 2022 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild