diff --git a/mccabe-0.5.0-no-pytest-runner.patch b/mccabe-0.5.0-no-pytest-runner.patch deleted file mode 100644 index 2f25eb1..0000000 --- a/mccabe-0.5.0-no-pytest-runner.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mccabe-0.5.0/setup.py.orig mccabe-0.5.0/setup.py ---- mccabe-0.5.0/setup.py.orig 2016-02-20 00:50:33.000000000 +0200 -+++ mccabe-0.5.0/setup.py 2016-08-13 21:15:12.630654671 +0300 -@@ -33,7 +33,6 @@ setup( - license='Expat license', - py_modules=['mccabe'], - zip_safe=False, -- setup_requires=['pytest-runner'], - tests_require=['pytest'], - entry_points={ - 'flake8.extension': [ diff --git a/python-mccabe.spec b/python-mccabe.spec index cb1bd54..812580e 100644 --- a/python-mccabe.spec +++ b/python-mccabe.spec @@ -11,15 +11,14 @@ Group: Development/Libraries License: MIT URL: http://pypi.python.org/pypi/mccabe Source0: https://files.pythonhosted.org/packages/source/m/%{modname}/%{modname}-%{version}.tar.gz -Patch0: %{modname}-0.5.0-no-pytest-runner.patch BuildArch: noarch BuildRequires: python2-devel, python-setuptools -BuildRequires: pytest +BuildRequires: pytest, python2-pytest-runner %if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-devel, python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-pytest, python%{python3_pkgversion}-pytest-runner %endif %description @@ -54,7 +53,6 @@ checker. %prep %setup -q -n %{modname}-%{version} -%patch0 -p1 # Remove bundled egg-info in case it exists rm -rf %{modname}.egg-info @@ -95,6 +93,9 @@ py.test-3 %endif %changelog +* Thu Jan 12 2017 Ville Skyttä +- Drop pytest-runner avoidance patch + * Tue Dec 13 2016 Stratakis Charalampos - 0.5.2-3 - Rebuild for Python 3.6