diff --git a/py2-skip-tests-interrupted-syscall.patch b/py2-skip-tests-interrupted-syscall.patch deleted file mode 100644 index 7226b94..0000000 --- a/py2-skip-tests-interrupted-syscall.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py -index 075c653..a530152 100644 ---- a/urwid/tests/test_vterm.py -+++ b/urwid/tests/test_vterm.py -@@ -174,6 +174,8 @@ class TermTest(unittest.TestCase): - self.write(edgewall % {'x': self.termsize[0] - 1, - 'y': self.termsize[1] - 1}) - -+ @unittest.skipIf(sys.version_info < (3, 0), -+ "tends to fail with Interrupted system call") - def test_horizontal_resize(self): - self.resize(80, 24) - self.edgewall() -@@ -186,6 +188,8 @@ class TermTest(unittest.TestCase): - self.flush() - self.expect('1-' + '\n' * 22 + '3-') - -+ @unittest.skipIf(sys.version_info < (3, 0), -+ "tends to fail with Interrupted system call") - def test_vertical_resize(self): - self.resize(80, 24) - self.edgewall() diff --git a/python-urwid.spec b/python-urwid.spec index 3a3bfdd..b74d064 100644 --- a/python-urwid.spec +++ b/python-urwid.spec @@ -1,16 +1,14 @@ Name: python-urwid Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Console user interface library License: LGPLv2+ URL: http://excess.org/urwid/ Source0: https://pypi.python.org/packages/source/u/urwid/urwid-%{version}.tar.gz -# Some tests are failing under Python 2. -# This is fixed in Python 3, see: -# https://docs.python.org/3/whatsnew/3.5.html#pep-475-retry-system-calls-failing-with-eintr -Patch0: py2-skip-tests-interrupted-syscall.patch +# https://github.com/urwid/urwid/pull/237/commits/f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 +Patch0: python-urwid-test_vterm-EINTR.patch %global _description\ Urwid is a Python library for making text console applications. It has\ @@ -90,6 +88,9 @@ popd %{python3_sitearch}/urwid-%{version}*.egg-info %changelog +* Wed Nov 15 2017 David Cantrell - 1.3.1-2 +- Apply upstream fix for EINTR handling in test_vterm test case + * Sat Aug 19 2017 Petr Viktorin - 1.3.1-1 - Update to upstream bugfix release 1.3.1 See http://urwid.org/changelog.html#urwid-1-3-1