#2 Only recommend termcolor
Merged 4 months ago by churchyard. Opened 4 months ago by churchyard.
rpms/ churchyard/python-pytest-shutil recommend_termcolor  into  master

file modified
+13 -5

@@ -3,7 +3,7 @@ 

  

  Name:           python-%{srcname}

  Version:        1.6.0

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        %{sum}

  

  License:        MIT

@@ -27,8 +27,8 @@ 

  

  %package -n python2-%{srcname}

  Summary:        %{sum}

+ Recommends:     %{py2_dist termcolor}

  %{?python_provide:%python_provide python2-%{srcname}}

- Requires:  python2-pytest

  

  %description -n python2-%{srcname}

  This library is a goodie-bag of Unix shell and 

@@ -36,8 +36,8 @@ 

  

  %package -n python3-%{srcname}

  Summary:        %{sum}

+ Recommends:     %{py3_dist termcolor}

  %{?python_provide:%python_provide python3-%{srcname}}

- Requires: python3-pytest

  

  %description -n python3-%{srcname}

  This library is a goodie-bag of Unix shell and 

@@ -46,6 +46,10 @@ 

  %prep

  %autosetup -n %{srcname}-%{version} -p1

  

+ # https://bugzilla.redhat.com/show_bug.cgi?id=1702355

+ sed -i "/'termcolor'/d" setup.py

+ 

+ 

  %build

  # Upstream pins pytest to older than 4.0.0 until they finish cleaning up deprecications. 

  # However, we have no choice and all the tests do pass fine, so we unpin here.

@@ -58,8 +62,9 @@ 

  %py3_install

  

  %check

- #{__python2} setup.py test

- %{__python3} setup.py test

+ # test_pretty_formatter requires termcolor

+ PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m pytest -k "not test_pretty_formatter"

+ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest

  

  %files -n python2-%{srcname}

  %doc README.md CHANGES.md

@@ -70,6 +75,9 @@ 

  %{python3_sitelib}/*

  

  %changelog

+ * Tue Apr 23 2019 Miro Hrončok <mhroncok@redhat.com> - 1.6.0-2

+ - Only recommend termcolor (#1702355)

+ 

  * Sun Apr 14 2019 Kevin Fenzi <kevin@scrye.com> - 1.6.0-1

  - Update to 1.6.0. Fixes bug #1697356