diff --git a/.gitignore b/.gitignore index a39bc02..ce56625 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ nose-0.11.3.tar.gz nose-0.11.4.tar.gz /nose-1.0.0.tar.gz +/nose-1.1.1.tar.gz diff --git a/nose-coverage-0.3.4.patch b/nose-coverage-0.3.4.patch deleted file mode 100644 index 233737b..0000000 --- a/nose-coverage-0.3.4.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: nose-0.11.4/functional_tests/doc_tests/test_coverage_html/coverage_html.rst -=================================================================== ---- nose-0.11.4.orig/functional_tests/doc_tests/test_coverage_html/coverage_html.rst -+++ nose-0.11.4/functional_tests/doc_tests/test_coverage_html/coverage_html.rst -@@ -32,9 +32,9 @@ The console coverage output is printed, - test_covered.test_blah ... hi - ok - -- Name Stmts Exec Cover Missing -+ Name Stmts Miss Cover Missing - ------------------------------------- -- blah 4 3 75% 6 -+ blah 4 1 75% 6 - ---------------------------------------------------------------------- - Ran 1 test in ...s - diff --git a/nose-py32.patch b/nose-py32.patch deleted file mode 100644 index 472e903..0000000 --- a/nose-py32.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -r 018b43db7c47 -r 211cabb6719b CHANGELOG ---- a/CHANGELOG Fri Mar 18 23:36:53 2011 -0500 -+++ b/CHANGELOG Fri Mar 18 23:38:55 2011 -0500 -@@ -1,4 +1,8 @@ --1.0 -+1.0.1 -+ -+- Fixed problems with SkipTest in Python 3.2 (#389) -+ -+1.0.0 - - - Made nose compatible with python 3. **Huge** thanks to Alex "foogod" - Stewart! -diff -r 018b43db7c47 -r 211cabb6719b nose/proxy.py ---- a/nose/proxy.py Fri Mar 18 23:36:53 2011 -0500 -+++ b/nose/proxy.py Fri Mar 18 23:38:55 2011 -0500 -@@ -148,6 +148,9 @@ - from nose.plugins.skip import SkipTest - self.assertMyTest(test) - plugins = self.plugins -+ if not isinstance(reason, Exception): -+ # for Python 3.2+ -+ reason = Exception(reason) - plugins.addError(self.test, (SkipTest, reason, None)) - self.result.addSkip(self.test, reason) - diff --git a/python-nose.spec b/python-nose.spec index aa7d520..2c63de6 100644 --- a/python-nose.spec +++ b/python-nose.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} < 13 && 0%{?rhel} < 5 +%if 0%{?rhel} < 13 && 0%{?rhel} < 5 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_version: %global python_version %(%{__python} -c "import sys ; print sys.version[:3]")} %endif @@ -16,18 +16,14 @@ %global with_docs 1 Name: python-nose -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Discovery-based unittest extension for Python Group: Development/Languages License: LGPLv2+ and Public Domain URL: http://somethingaboutorange.com/mrl/projects/nose/ Source0: http://somethingaboutorange.com/mrl/projects/nose/nose-%{version}.tar.gz -# Python-3.2 build fix for -# http://code.google.com/p/python-nose/issues/detail?id=389 -# partial hg changeset 211cabb6719b -Patch0: nose-py32.patch # Submitted upstream: http://code.google.com/p/python-nose/issues/detail?id=421 Patch1: nose-manpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -96,7 +92,6 @@ python3 unittests. %prep %setup -q -n %{upstream_name}-%{version} -%patch0 -p1 -b .py32 %patch1 -p1 -b .manp dos2unix examples/attrib_plugin.py @@ -184,9 +179,8 @@ rm -rf %{buildroot} %endif # with_docs %changelog -* Thu May 19 2011 Toshio Kuratomi - 1.0.0-3 -- Backport fix for problems with python3.2 -- Patch to fix man page +* Wed Jul 27 2011 Toshio Kuratomi - 1.1.1-1 +- Upstream bugfix release * Tue Feb 08 2011 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 67c05bc..5357efd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9542d4c66e04880d8144990de76e0b88 nose-1.0.0.tar.gz +dc3025249c7abd27ac9020ec13b40db9 nose-1.1.1.tar.gz