[python-nose-progressive] new upstream bug fix release 1.5

[Dan Callaghan]

commit 31159b80c61667185305ef45c5fc8ec23929dcaf
Author: Dan Callaghan <dcallagh at redhat.com>
Date:   Mon Apr 29 13:48:27 2013 +1000

    new upstream bug fix release 1.5

 .gitignore                          |    1 +
 0001-read-README.rst-as-UTF-8.patch |   35 +++++++++++++++++++++++++++++++++++
 python-nose-progressive.spec        |   17 ++++++++++++++---
 sources                             |    2 +-
 4 files changed, 51 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index acbc50d..a98b7cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /nose-progressive-1.3.tar.gz
 /nose-progressive-1.4.tar.gz
 /nose-progressive-1.4.1.tar.gz
+/nose-progressive-1.5.tar.gz
diff --git a/0001-read-README.rst-as-UTF-8.patch b/0001-read-README.rst-as-UTF-8.patch
new file mode 100644
index 0000000..bdb2efb
--- /dev/null
+++ b/0001-read-README.rst-as-UTF-8.patch
@@ -0,0 +1,35 @@
+From 3c03759c3cd9dd93a427583092630cf1470569bd Mon Sep 17 00:00:00 2001
+From: Dan Callaghan <dcallagh at redhat.com>
+Date: Mon, 29 Apr 2013 13:31:32 +1000
+Subject: [PATCH] read README.rst as UTF-8
+
+This is necessary on Python 3. The default encoding might be ASCII (for
+example in a build system) or indeed any encoding other than UTF-8.
+
+Use codecs.open since open doesn't accept an encoding in Python 2.
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 38a7daf..ea764fc 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,5 @@
+ import sys
++import codecs
+ 
+ # Prevent spurious errors during `python setup.py test`, a la
+ # http://www.eby-sarna.com/pipermail/peak/2010-May/003357.html:
+@@ -18,7 +19,7 @@ setup(
+     name='nose-progressive',
+     version='1.5',
+     description='A testrunner with a progress bar and smarter tracebacks',
+-    long_description=open('README.rst').read(),
++    long_description=codecs.open('README.rst', encoding='utf8').read(),
+     author='Erik Rose',
+     author_email='erikrose at grinchcentral.com',
+     license='GPL',
+-- 
+1.7.11.7
+
diff --git a/python-nose-progressive.spec b/python-nose-progressive.spec
index 426d083..3c4c789 100644
--- a/python-nose-progressive.spec
+++ b/python-nose-progressive.spec
@@ -7,12 +7,14 @@
 %endif
 
 Name:           python-%{upstream_name}
-Version:        1.4.1
+Version:        1.5
 Release:        1%{?dist}
 Summary:        Nose plugin to show a progress bar and tracebacks during tests
 License:        GPLv2+
 URL:            https://github.com/erikrose/nose-progressive
 Source0:        http://pypi.python.org/packages/source/n/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+# https://github.com/erikrose/nose-progressive/pull/58
+Patch0:         0001-read-README.rst-as-UTF-8.patch
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
@@ -50,6 +52,7 @@ a number of other human-centric features to speed the debugging process.
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
+%patch0 -p1
 rm -r nose_progressive.egg-info
 
 %if %{with python3}
@@ -76,8 +79,13 @@ popd
 %{__python} setup.py install --skip-build --root %{buildroot}
 
 %check
-# Tests fail due to differing escape sequences... terminfo???
-#%%{__python} setup.py nosetests
+%if %{with python3}
+pushd %{py3dir}
+%{__python3} setup.py nosetests
+popd
+%endif
+
+%{__python} setup.py nosetests
 
 %files
 %doc README.rst
@@ -92,6 +100,9 @@ popd
 %endif
 
 %changelog
+* Mon Apr 29 2013 Dan Callaghan <dcallagh at redhat.com> - 1.5-1
+- new upstream bug fix release 1.5
+
 * Wed Mar 27 2013 Dan Callaghan <dcallagh at redhat.com> - 1.4.1-1
 - new upstream bug fix release 1.4.1
 
diff --git a/sources b/sources
index ffcf168..0cc1116 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9722c18f24ddd8e93acbf6b763b676a5  nose-progressive-1.4.1.tar.gz
+eb3d837d7557e2228e4762b85f2d586e  nose-progressive-1.5.tar.gz