dev-python/nose: Propargate latest changes to live ebuild

clean old patches

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec@gentoo.org>

8 files changed, 31 insertions, 221 deletions

diff --git a/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch b/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch
deleted file mode 100644
index 5ce5a1db8801..000000000000
--- a/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/conf.py.orig	2009-05-07 03:12:35.000000000 +0200
-+++ doc/conf.py	2009-05-13 10:13:12.588540888 +0200
-@@ -31,7 +31,7 @@
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
-+extensions = ['sphinx.ext.autodoc',
-               'nose.sphinx.pluginopts', 'manbuilder']
- 
- # Add any paths that contain templates here, relative to this directory.
-@@ -231,4 +231,4 @@
- 
- 
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/dev': None}
-+#intersphinx_mapping = {'http://docs.python.org/dev': None}
diff --git a/dev-python/nose/files/nose-1.2.1-skiptest.patch b/dev-python/nose/files/nose-1.2.1-skiptest.patch
deleted file mode 100644
index b8f7a57f4da8..000000000000
--- a/dev-python/nose/files/nose-1.2.1-skiptest.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Tests are set to compulsory fail, cannot be set to expectedFailure
-diff -ur nose-1.2.1.orig/functional_tests/test_program.py nose-1.2.1/functional_tests/test_program.py
---- functional_tests/test_program.py	2011-12-14 22:01:38.000000000 +0800
-+++ functional_tests/test_program.py	2013-03-02 14:50:28.628004408 +0800
-@@ -1,5 +1,8 @@
--import os
--import unittest
-+import os, sys
-+if sys.version_info[:2] == (2, 7) or hasattr(sys, 'pypy_version_info'):
-+    import unittest
-+else:
-+    import unittest2 as unittest
- from cStringIO import StringIO
- from nose import SkipTest
- from nose.core import TestProgram
-@@ -91,6 +91,7 @@
-         assert not res.errors
-         assert not res.failures
- 
-+    @unittest.skip("tests set to exit with compulsory fail, error")
-     def test_run_support_twist(self):
-         """Collect and run tests in functional/support/twist
- 
diff --git a/dev-python/nose/files/nose-1.3.1-doctest.patch b/dev-python/nose/files/nose-1.3.1-doctest.patch
deleted file mode 100644
index 37d0dcced96c..000000000000
--- a/dev-python/nose/files/nose-1.3.1-doctest.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/nose-devs/nose/commit/5bcedc9a0601b4f70e2cba6c14c3046fb326bfaa.diff
-diff --git a/unit_tests/test_config_defaults.rst b/unit_tests/test_config_defaults.rst
-index 944d370..034f58e 100644
---- a/unit_tests/test_config_defaults.rst
-+++ b/unit_tests/test_config_defaults.rst
-@@ -89,9 +89,9 @@ Invalid config files
- 
- (file-like object)
- 
--    >>> options, args = parse([], StringIO("spam"))
-+    >>> options, args = parse([], StringIO("spam")) # doctest: +ELLIPSIS
-     error: Error reading config file '<???>': File contains no section headers.
--    file: <???>, line: 1
-+    file: ...<???>..., line: 1
-     'spam'
- 
- (filename)
-@@ -99,7 +99,7 @@ Invalid config files
-     >>> options, args = parse([], os.path.join(support, "invalid.cfg"))
-     ... # doctest: +ELLIPSIS
-     error: Error reading config file '...invalid.cfg': File contains no section headers.
--    file: ...invalid.cfg, line: 1
-+    file: ...invalid.cfg..., line: 1
-     'spam\n'
- 
- (filenames, length == 1)
-@@ -107,7 +107,7 @@ Invalid config files
-     >>> options, args = parse([], [os.path.join(support, "invalid.cfg")])
-     ... # doctest: +ELLIPSIS
-     error: Error reading config file '...invalid.cfg': File contains no section headers.
--    file: ...invalid.cfg, line: 1
-+    file: ...invalid.cfg..., line: 1
-     'spam\n'
- 
- (filenames, length > 1)
-@@ -120,7 +120,7 @@ file is bad
-     ...                            os.path.join(support, "b.cfg")])
-     ... # doctest: +ELLIPSIS
-     error: Error reading config file '...invalid.cfg': File contains no section headers.
--    file: ...invalid.cfg, line: 1
-+    file: ...invalid.cfg..., line: 1
-     'spam\n'
- 
- 
-
diff --git a/dev-python/nose/files/nose-1.3.1-pypy-test.patch b/dev-python/nose/files/nose-1.3.1-pypy-test.patch
deleted file mode 100644
index 41ad4687c8a7..000000000000
--- a/dev-python/nose/files/nose-1.3.1-pypy-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/nose-devs/nose/commit/0181572a64195a8fa1c6c867ae6c61a79a9606ca.diff
-
-diff --git a/nose/util.py b/nose/util.py
-index dcb5fef..e612696 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -447,11 +447,10 @@ def try_run(obj, names):
-         if func is not None:
-             if type(obj) == types.ModuleType:
-                 # py.test compatibility
--                try:
--                    args, varargs, varkw, defaults = inspect.getargspec(func)
--                    if hasattr(func, '__call__') and ismethod(func.__call__):
--                        args.pop(0)
--                except TypeError:
-+                if isinstance(func, types.FunctionType):
-+                    args, varargs, varkw, defaults = \
-+                        inspect.getargspec(func)
-+                else:
-                     # Not a function. If it's callable, call it anyway
-                     if hasattr(func, '__call__'):
-                         func = func.__call__
-diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
-index 2bd837c..cd9ba6e 100644
---- a/unit_tests/test_utils.py
-+++ b/unit_tests/test_utils.py
-@@ -1,4 +1,5 @@
- import os
-+import sys
- import unittest
- import nose
- from nose import case
-@@ -168,7 +169,7 @@ def __call__(self):
-         class Bar_m:
-             def __call__(self, mod):
-                 pass
--        
-+
-         foo = imp.new_module('foo')
-         foo.bar = bar
-         foo.bar_m = bar_m
-
diff --git a/dev-python/nose/files/nose-1.3.1-python3.4.patch b/dev-python/nose/files/nose-1.3.1-python3.4.patch
deleted file mode 100644
index 2269f755c3f0..000000000000
--- a/dev-python/nose/files/nose-1.3.1-python3.4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 192694ed9f70447317bd54e427a17208bddf03be Mon Sep 17 00:00:00 2001
-From: John Szakmeister <john@szakmeister.net>
-Date: Sat, 15 Mar 2014 06:15:42 -0400
-Subject: [PATCH] Fix #783: try_run is broken with Python 3.4
-
-It turns out that we expected inspect.getargspec() to only work on
-functions (versus classes that are callable).  Python 3.4 has changed
-this behavior and now happily returns the arg spec.  Let's try to detect
-this situation by checking the __call__() method to if it's actually the
-method of a class.  If so, pop the 'self' argument off of args--similar
-to what's done in the exceptional case below.
----
- CHANGELOG    | 1 +
- nose/util.py | 4 +++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/nose/util.py b/nose/util.py
-index 7995700..dcb5fef 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -8,7 +8,7 @@
- import sys
- import types
- import unittest
--from nose.pyversion import ClassType, TypeType, isgenerator
-+from nose.pyversion import ClassType, TypeType, isgenerator, ismethod
- 
- 
- log = logging.getLogger('nose')
-@@ -449,6 +449,8 @@ def try_run(obj, names):
-                 # py.test compatibility
-                 try:
-                     args, varargs, varkw, defaults = inspect.getargspec(func)
-+                    if hasattr(func, '__call__') and ismethod(func.__call__):
-+                        args.pop(0)
-                 except TypeError:
-                     # Not a function. If it's callable, call it anyway
-                     if hasattr(func, '__call__'):
--- 
-1.8.5.5
-
diff --git a/dev-python/nose/files/nose-1.3.1-version.patch b/dev-python/nose/files/nose-1.3.1-version.patch
deleted file mode 100644
index 8f6edb5be2ef..000000000000
--- a/dev-python/nose/files/nose-1.3.1-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/nose-devs/nose/commit/43c35e49106916f51f676455888fe7a39d030113.diff
-diff --git a/nose/pyversion.py b/nose/pyversion.py
-index fba5ada..8b56614 100644
---- a/nose/pyversion.py
-+++ b/nose/pyversion.py
-@@ -89,7 +89,8 @@ def __init__(self, cls, func):
-         self.__dict__ = func.__dict__.copy()
-         self._func = func
-         self.__self__ = UnboundSelf(cls)
--        self.im_class = cls
-+        if sys.version_info < (3, 0):
-+            self.im_class = cls
- 
-     def address(self):
-         cls = self.__self__.cls
-
diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7.ebuild
index 26a7859c683e..0a8e36125bcb 100644
--- a/dev-python/nose/nose-1.3.7.ebuild
+++ b/dev-python/nose/nose-1.3.7.ebuild
@@ -22,9 +22,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 IUSE="doc examples test"
 
 REQUIRED_USE="
-	doc? (
-		|| ( $(python_gen_useflags 'python2*') )
-	)"
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
@@ -70,10 +68,7 @@ python_compile() {
 }
 
 python_compile_all() {
-	if use doc; then
-		python_setup 'python2*'
-		emake -C doc html
-	fi
+	use doc && emake -C doc html
 }
 
 python_test() {
@@ -88,5 +83,4 @@ python_install_all() {
 	use examples && local EXAMPLES=( examples/. )
 	use doc && HTML_DOCS=( doc/.build/html/. )
 	distutils-r1_python_install_all
-
 }
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index fa4b126cf843..67dd10344de9 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -2,46 +2,46 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-#if LIVE
-EGIT_REPO_URI="git://github.com/nose-devs/${PN}.git
-	https://github.com/nose-devs/${PN}.git"
-inherit git-2
-#endif
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1 eutils
+
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="https://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://pypi.python.org/pypi/nose
+	http://readthedocs.org/docs/nose/
+	https://github.com/nose-devs/nose"
+SRC_URI=""
+EGIT_REPO_URI="
+	git://github.com/nose-devs/${PN}.git
+	https://github.com/nose-devs/${PN}.git"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc examples test"
 
-RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
+REQUIRED_USE="
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="
+	dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6 )
-	test? ( dev-python/twisted-core )"
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
 
-#if LIVE
-SRC_URI=
-KEYWORDS=
-#endif
-
-DOCS=( AUTHORS )
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
 
 python_prepare_all() {
 	# Tests need to be converted, and they don't respect BUILD_DIR.
 	use test && DISTUTILS_IN_SOURCE_BUILD=1
 
-	# Disable sphinx.ext.intersphinx, requires network
-	epatch "${FILESDIR}/${PN}-0.11.0-disable_intersphinx.patch"
 	# Disable tests requiring network connection.
 	sed \
 		-e "s/test_resolve/_&/g" \
@@ -53,6 +53,9 @@ python_prepare_all() {
 	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
 		-i setup.py || die "sed2 failed"
 
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -61,7 +64,7 @@ python_compile() {
 
 	if use test; then
 		add_targets+=( egg_info )
-		[[ ${EPYTHON} == python3* ]] && add_targets+=( build_tests )
+		python_is_python3 && add_targets+=( build_tests )
 	fi
 
 	distutils-r1_python_compile ${add_targets[@]}
@@ -72,7 +75,7 @@ python_compile_all() {
 }
 
 python_test() {
-	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
+	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {
@@ -80,10 +83,7 @@ python_install() {
 }
 
 python_install_all() {
-	local EXAMPLES=( examples/. )
+	use examples && local EXAMPLES=( examples/. )
+	use doc && HTML_DOCS=( doc/.build/html/. )
 	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r -A txt doc/.build/html/.
-	fi
 }