aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/manuel/files/manuel-1.5.0-rm_zope_test.patch21
-rw-r--r--dev-python/testfixtures/testfixtures-2.3.4.ebuild6
2 files changed, 4 insertions, 23 deletions
diff --git a/dev-python/manuel/files/manuel-1.5.0-rm_zope_test.patch b/dev-python/manuel/files/manuel-1.5.0-rm_zope_test.patch
deleted file mode 100644
index 741910b..0000000
--- a/dev-python/manuel/files/manuel-1.5.0-rm_zope_test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur manuel-1.5.0.orig/src/manuel/tests.py manuel-1.5.0/src/manuel/tests.py
---- src/manuel/tests.py 2011-03-09 09:33:11.000000000 +0800
-+++ src/manuel/tests.py 2012-04-27 21:40:45.653694740 +0800
-@@ -9,7 +9,7 @@
- import os.path
- import re
- import unittest
--import zope.testing.renormalizing
-+#import zope.testing.renormalizing
-
- doctest = manuel.absolute_import('doctest')
-
-@@ -52,7 +52,7 @@
- optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-
- m = manuel.ignore.Manuel()
-- m += manuel.doctest.Manuel(optionflags=optionflags, checker=checker)
-+# m += manuel.doctest.Manuel(optionflags=optionflags, checker=checker)
- m += manuel.codeblock.Manuel()
- m += manuel.capture.Manuel()
- m += manuel.testcase.SectionManuel()
diff --git a/dev-python/testfixtures/testfixtures-2.3.4.ebuild b/dev-python/testfixtures/testfixtures-2.3.4.ebuild
index 21565dc..7099e96 100644
--- a/dev-python/testfixtures/testfixtures-2.3.4.ebuild
+++ b/dev-python/testfixtures/testfixtures-2.3.4.ebuild
@@ -20,7 +20,8 @@ IUSE="doc test"
RDEPEND=""
DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )"
+ doc? ( dev-python/sphinx )
+ test? ( dev-python/manuel )"
# test? ( net-zope/zope-component )"
src_prepare() {
@@ -28,12 +29,13 @@ src_prepare() {
-i docs/Makefile || die
sed -e 's/except ImportError:/except: pass/' \
-e "s:^ raise SkipTest('zope.component is not available')::" -i testfixtures/tests/test_components.py || die
- epatch "${FILESDIR}"/test.patch
+ epatch "${FILESDIR}"/${P}-adjust_tests.patch
# remove test that tests the stripped zope-component test_components.ComponentsTests
rm -f testfixtures/tests/test_components.py || die
distutils_src_prepare
}
+
src_compile() {
distutils_src_compile