From 8030e634ed29a80a95fb6425d9cd2d014e06493c Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Jun 03 2019 16:42:32 +0000 Subject: Add patch for pytest 4 compatibility, pytest 3 deprecation --- diff --git a/python-flake8-polyfill-1.0.2-pytest-4-compatibility.patch b/python-flake8-polyfill-1.0.2-pytest-4-compatibility.patch new file mode 100644 index 0000000..a3539d0 --- /dev/null +++ b/python-flake8-polyfill-1.0.2-pytest-4-compatibility.patch @@ -0,0 +1,23 @@ +From ff82ec5bfc3952dc895dd486a350e303aa45093d Mon Sep 17 00:00:00 2001 +From: Scott K Logan +Date: Mon, 3 Jun 2019 09:23:13 -0700 +Subject: [PATCH] Use 'tool:pytest' in place of 'pytest' in setup.cfg + +The use of 'pytest' was deprecated in pytest 3, and removed in pytest 4. +See pytest-dev/pytest#3086. +--- + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 752171c..1daff5b 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,6 +1,6 @@ + [bdist_wheel] + universal=1 + +-[pytest] ++[tool:pytest] + norecursedirs = .git .* *.egg* old docs dist build + addopts = -rw diff --git a/python-flake8-polyfill.spec b/python-flake8-polyfill.spec index d94f508..3a35487 100644 --- a/python-flake8-polyfill.spec +++ b/python-flake8-polyfill.spec @@ -2,13 +2,16 @@ Name: python-%{srcname} Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Polyfill package for Flake8 plugins License: MIT URL: https://gitlab.com/pycqa/%{srcname} Source0: https://gitlab.com/pycqa/%{srcname}/-/archive/%{version}/%{srcname}-%{version}.tar.gz +# Submitted upstream as pycqa/flake8-polyfill#1 +Patch0: %{name}-1.0.2-pytest-4-compatibility.patch + BuildArch: noarch %description @@ -60,5 +63,8 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %changelog +* Mon Jun 03 2019 Scott K Logan - 1.0.2-2 +- Add patch for pytest 4 compatibility, pytest 3 deprecation (rhbz#1716494) + * Thu Mar 21 2019 Scott K Logan - 1.0.2-1 - Initial package