summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/nose/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/nose/files')
-rw-r--r--dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch17
-rw-r--r--dev-python/nose/files/nose-1.2.1-skiptest.patch23
-rw-r--r--dev-python/nose/files/nose-1.3.1-doctest.patch45
-rw-r--r--dev-python/nose/files/nose-1.3.1-pypy-test.patch42
-rw-r--r--dev-python/nose/files/nose-1.3.1-python3.4.patch41
-rw-r--r--dev-python/nose/files/nose-1.3.1-version.patch16
6 files changed, 184 insertions, 0 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
new file mode 100644
index 000000000000..5ce5a1db8801
--- /dev/null
+++ b/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch
@@ -0,0 +1,17 @@
+--- 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
new file mode 100644
index 000000000000..b8f7a57f4da8
--- /dev/null
+++ b/dev-python/nose/files/nose-1.2.1-skiptest.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..37d0dcced96c
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.1-doctest.patch
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 000000000000..41ad4687c8a7
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.1-pypy-test.patch
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000000..2269f755c3f0
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.1-python3.4.patch
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 000000000000..8f6edb5be2ef
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.1-version.patch
@@ -0,0 +1,16 @@
+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
+