Update to 3.0.6.

Drop patch applied upstream.
This commit is contained in:
Thomas Moschny 2017-01-29 12:57:57 +01:00
parent 23aa29708f
commit 9ffb2fd4ac
3 changed files with 7 additions and 34 deletions

View File

@ -1,24 +0,0 @@
diff --git a/testing/test_doctest.py b/testing/test_doctest.py
index 4ea2cc5..a82071c 100644
--- a/testing/test_doctest.py
+++ b/testing/test_doctest.py
@@ -211,8 +211,8 @@ class TestDoctests:
# doctest is never executed because of error during hello.py collection
result.stdout.fnmatch_lines([
"*>>> import asdals*",
- "*UNEXPECTED*ImportError*",
- "ImportError: No module named *asdal*",
+ "*UNEXPECTED*Error*",
+ "*Error: No module named *asdal*",
])
def test_doctest_unex_importerror_with_module(self, testdir):
@@ -227,7 +227,7 @@ class TestDoctests:
# doctest is never executed because of error during hello.py collection
result.stdout.fnmatch_lines([
"*ERROR collecting hello.py*",
- "*ImportError: No module named *asdals*",
+ "*Error: No module named *asdals*",
"*Interrupted: 1 errors during collection*",
])

View File

@ -1,8 +1,8 @@
%global pylib_version 1.4.29
Name: pytest
Version: 3.0.5
Release: 2%{?dist}
Version: 3.0.6
Release: 1%{?dist}
Summary: Simple powerful testing with Python
License: MIT
URL: http://pytest.org
@ -13,9 +13,6 @@ Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name}
# that is not possible as it depends on pytest
%bcond_without timeout
# https://github.com/pytest-dev/pytest/issues/2132
Patch0: %{name}-python36.patch
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python3-devel
@ -84,10 +81,6 @@ py.test provides simple, yet powerful testing for Python.
mv %{name}-%{version} python2
cp -a python2 python3
pushd python3
%patch0 -p1
popd
%build
pushd python2
@ -205,6 +198,10 @@ popd
%changelog
* Sun Jan 29 2017 Thomas Moschny <thomas.moschny@gmx.de> - 3.0.6-1
- Update to 3.0.6.
- Drop patch applied upstream.
* Tue Dec 13 2016 Miro Hrončok <mhroncok@redhat.com> - 3.0.5-2
- Rebuild for Python 3.6

View File

@ -1 +1 @@
cefd527b59332688bf5db4a10aa8a7cb pytest-3.0.5.tar.gz
SHA512 (pytest-3.0.6.tar.gz) = 0e983f1f52c18327537d20be30425f4c74037d1fbf6b4aedf2646cf21d450fa9b2b20625f26f5db759b4fe1fd28c6640cb1df88e667efaeea6642e7f02f01e06