From df9cbe0c878ae0f6654b94e195c812604672bf12 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Nov 20 2019 18:20:53 +0000 Subject: updates for EL8 support * Adds python-zipp for building * Sets the pytest version to 3.4 which is what EL8 provides * Conditionally removes flake8 testing which can't be done with pytest and flake8 versions required --- diff --git a/python-portend.spec b/python-portend.spec index ea2c9b8..63abb40 100644 --- a/python-portend.spec +++ b/python-portend.spec @@ -21,13 +21,14 @@ Summary: portend documentation BuildRequires: python3-devel BuildRequires: python3dist(jaraco.functools) -BuildRequires: python3dist(pytest) >= 3.5 +BuildRequires: python3dist(pytest) >= 3.4 BuildRequires: python3dist(pytest-cov) -BuildRequires: python3dist(pytest-flake8) +%{?fedora:BuildRequires: python3dist(pytest-flake8)} #BuildRequires: python3dist(pytest-sugar) >= 0.9.1 BuildRequires: python3dist(setuptools) BuildRequires: python3dist(setuptools-scm) >= 1.15 BuildRequires: python3dist(tempora) >= 1.8 +BuildRequires: python3dist(zipp) %description -n python3-%{pypi_name} por·tend pôrˈtend/ be a sign or warning that (something, especially something @@ -40,6 +41,7 @@ Summary: portend documentation BuildRequires: python3dist(jaraco.packaging) >= 3.2 BuildRequires: python3dist(rst.linker) >= 1.9 BuildRequires: python3dist(sphinx) +BuildRequires: python3-more-itertools %description -n python-%{pypi_name}-doc Documentation for portend @@ -66,6 +68,11 @@ rm -rf html/.{doctrees,buildinfo} %py3_install %check +%if 0%{?el8} +# disable flake8 in the tests, need a newer version of pytest (3.5) which is not +# available on EL8, and is pulled in by python-pytest-flake8. +sed -i 's/ --flake8//' pytest.ini +%endif LANG=C.utf-8 %{__python3} -m pytest --ignore=build %files -n python3-%{pypi_name}