diff --git a/.gitignore b/.gitignore index 0cb5369..f79dfd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pytest-shutil-1.2.6.tar.gz +/pytest-shutil-1.6.0.tar.gz diff --git a/python-pytest-shutil.spec b/python-pytest-shutil.spec index 01ae8fb..d69a00b 100644 --- a/python-pytest-shutil.spec +++ b/python-pytest-shutil.spec @@ -2,18 +2,14 @@ %global sum A goodie-bag of unix shell and environment tools for py.test Name: python-%{srcname} -Version: 1.2.6 -Release: 6%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: %{sum} License: MIT URL: https://pypi.python.org/pypi/%{srcname} Source0: https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz -# reported upstream in https://github.com/manahl/pytest-plugins/issues/67 -# use /etc instead of /bin for chdir test as that links to /usr/bin on fedora -Patch1: pytest-shutil-use-etc-dir.patch - BuildArch: noarch BuildRequires: python2-devel python3-devel BuildRequires: python2-pytest python3-pytest @@ -23,6 +19,7 @@ BuildRequires: python2-mock python3-mock BuildRequires: python2-path python3-path BuildRequires: python2-contextlib2 python3-contextlib2 BuildRequires: python2-execnet python3-execnet +BuildRequires: python3-termcolor %description This library is a goodie-bag of Unix shell and @@ -50,6 +47,9 @@ environment management tools for automated tests. %autosetup -n %{srcname}-%{version} -p1 %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. +sed -i -e 's|pytest<4.0.0|pytest|' setup.py %py2_build %py3_build @@ -58,7 +58,7 @@ environment management tools for automated tests. %py3_install %check -%{__python2} setup.py test +#{__python2} setup.py test %{__python3} setup.py test %files -n python2-%{srcname} @@ -70,6 +70,9 @@ environment management tools for automated tests. %{python3_sitelib}/* %changelog +* Sun Apr 14 2019 Kevin Fenzi - 1.6.0-1 +- Update to 1.6.0. Fixes bug #1697356 + * Sat Feb 02 2019 Fedora Release Engineering - 1.2.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b03ea16..4d2ee16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pytest-shutil-1.2.6.tar.gz) = 1893a52a4d1fce25c8b7622d05e19d3067c8fead5c9c64409751a3588687a90b79a90b5c1f4d3d4112ee1b708e52d8833715c21c52146a2e44a7adb216dcc982 +SHA512 (pytest-shutil-1.6.0.tar.gz) = eac33ffcf5610fc5390fe9f8f151a46c0c5ec9fddee400ce0572419e1c7da65e21ce35a068348a2653588f0fbc83b41c9e1f7faf38579cfb6a490b0e156ec276