Backport fix for problems with python3.2
Patch to fix man page
This commit is contained in:
parent
06d60ba37e
commit
9a532af53b
12
nose-manpage.patch
Normal file
12
nose-manpage.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -r 068efd358695 nosetests.1
|
||||
--- a/nosetests.1 Mon May 02 15:32:48 2011 -0500
|
||||
+++ b/nosetests.1 Thu May 19 08:22:49 2011 -0700
|
||||
@@ -82,7 +82,7 @@
|
||||
In addition to passing command\-line options, you may also put
|
||||
configuration options in your project\'s \fIsetup.cfg\fP file, or a .noserc
|
||||
or nose.cfg file in your home directory. In any of these standard
|
||||
-.ini\-style config files, you put your nosetests configuration in a
|
||||
+\&.ini\-style config files, you put your nosetests configuration in a
|
||||
\fB[nosetests]\fP section. Options are the same as on the command line,
|
||||
with the \-\- prefix removed. For options that are simple switches, you
|
||||
must supply a value:
|
26
nose-py32.patch
Normal file
26
nose-py32.patch
Normal file
@ -0,0 +1,26 @@
|
||||
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)
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")}
|
||||
|
||||
%if 0%{?fedora} > 12 || 0%{?rhel} > 6
|
||||
%if 0%{?fedora} || 0%{?rhel} > 6
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
@ -13,17 +13,23 @@
|
||||
%global upstream_name nose
|
||||
|
||||
# Enable building without docs to avoid a circular dependency between this and python-sphinx
|
||||
%global with_docs 0
|
||||
%global with_docs 1
|
||||
|
||||
Name: python-nose
|
||||
Version: 1.0.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?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)
|
||||
|
||||
BuildArch: noarch
|
||||
@ -90,6 +96,8 @@ python3 unittests.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{upstream_name}-%{version}
|
||||
%patch0 -p1 -b .py32
|
||||
%patch1 -p1 -b .manp
|
||||
|
||||
dos2unix examples/attrib_plugin.py
|
||||
|
||||
@ -176,6 +184,10 @@ rm -rf %{buildroot}
|
||||
%endif # with_docs
|
||||
|
||||
%changelog
|
||||
* Thu May 19 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0.0-3
|
||||
- Backport fix for problems with python3.2
|
||||
- Patch to fix man page
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user