#1 BuildRequire and invoke tox directly (allows us to drop python2-tox from the distro)
Merged 5 years ago by churchyard. Opened 6 years ago by churchyard.
rpms/ churchyard/python-mpd2 notox2  into  master

file modified
+8 -5
@@ -9,7 +9,7 @@ 

  

  Name:           python-%{srcname}

  Version:        0.5.5

- Release:        5%{?dist}

+ Release:        6%{?dist}

  Summary:        Python library providing a client interface for MPD

  

  License:        LGPLv3+
@@ -17,6 +17,7 @@ 

  Source0:        https://github.com/Mic92/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz

  

  BuildArch:      noarch

+ BuildRequires:  %{_bindir}/tox

  

  %description

  Python library providing a client interface for MPD.
@@ -26,7 +27,6 @@ 

  BuildRequires:  python2-setuptools

  BuildRequires:  python2-sphinx

  BuildRequires:  python2-mock

- BuildRequires:  python2-tox

  BuildRequires:  python2-twisted

  # Has the same Python module name in Python2 namespace.

  Conflicts:      python-mpd
@@ -41,7 +41,6 @@ 

  BuildRequires:  python3-devel

  BuildRequires:  python3-setuptools

  BuildRequires:  python3-mock

- BuildRequires:  python3-tox

  BuildRequires:  python3-twisted

  Summary:        Python 3 mpd2 module

  %{?python_provide:%python_provide python3-%{srcname}}
@@ -87,9 +86,9 @@ 

  %endif

  

  %check

- TOX_TESTENV_PASSENV=PYTHONPATH TOXENV=py27 %{__python2} setup.py test

+ TOX_TESTENV_PASSENV=PYTHONPATH TOXENV=py27 tox --sitepackages

  %if %{with_python3}

- TOX_TESTENV_PASSENV=PYTHONPATH TOXENV=py36 %{__python3} setup.py test

+ TOX_TESTENV_PASSENV=PYTHONPATH TOXENV=py%{python3_version_nodots} tox --sitepackages

  %endif

  

  %files -n python2-%{srcname}
@@ -112,6 +111,10 @@ 

  

  

  %changelog

+ * Mon May 07 2018 Miro Hrončok <mhroncok@redhat.com> - 0.5.5-6

+ - BuildRequire and invoke tox directly (allows us to drop python2-tox from the distro)

+ - Use macro instead of hardcoded Python 3.6 version

+ 

  * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-5

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild