From 579608d3e883161eb29a902553dbba2ab17152cc Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Dec 03 2019 20:09:59 +0000 Subject: changes needed for EL8 support * adds the python dependency generator, so tempora and others are pulled in * adds a patch to skip using pytest 3.4 incompatible fixtures * requires more-itertools for building --- diff --git a/python-cherrypy.spec b/python-cherrypy.spec index 9f4a319..31d47d8 100644 --- a/python-cherrypy.spec +++ b/python-cherrypy.spec @@ -1,6 +1,7 @@ # This package depends on automagic byte compilation # https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 %global _python_bytecompile_extra 1 +%{?python_enable_dependency_generator} Name: python-cherrypy %global camelname CherryPy @@ -14,6 +15,11 @@ Source0: https://files.pythonhosted.org/packages/source/C/%{camelname}/%{ # Don't ship the tests or tutorials in the python module directroy, # tutorial will be shipped as doc instead +# https://github.com/cherrypy/cherrypy/issues/1824 +# Do not use newer pytest fixtures that aren't part of pytest 3.4.2 - this can be +# removed once 3.9.1 (or newer) is packaged. +Patch0: 0001.patch + BuildArch: noarch obsoletes: python2-cherrypy < 3.5.1 @@ -31,6 +37,7 @@ BuildRequires: python3dist(portend) BuildRequires: python3dist(pytest) BuildRequires: python3dist(pytest-cov) BuildRequires: python3dist(requests-toolbelt) +BuildRequires: python3dist(more-itertools) BuildRequires: python3dist(coverage) BuildRequires: python3dist(pytest) BuildRequires: python3-zc-lockfile @@ -50,6 +57,7 @@ Summary: %summary %prep %setup -q -n %{camelname}-%{version} +%patch0 -p1 dos2unix cherrypy/tutorial/tutorial.conf