| 1 |
idella4 14/03/30 13:05:38 |
| 2 |
|
| 3 |
Modified: cherrypy-3.2.2-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
edit out broken tests wrt Bug #494054 by eroen |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.9 dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild?rev=1.9&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild?rev=1.9&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild?r1=1.8&r2=1.9 |
| 15 |
|
| 16 |
Index: cherrypy-3.2.2-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v |
| 19 |
retrieving revision 1.8 |
| 20 |
retrieving revision 1.9 |
| 21 |
diff -u -r1.8 -r1.9 |
| 22 |
--- cherrypy-3.2.2-r1.ebuild 22 Oct 2013 11:38:39 -0000 1.8 |
| 23 |
+++ cherrypy-3.2.2-r1.ebuild 30 Mar 2014 13:05:38 -0000 1.9 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2013 Gentoo Foundation |
| 26 |
+# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.8 2013/10/22 11:38:39 grobian Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.9 2014/03/30 13:05:38 idella4 Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 ) |
| 33 |
@@ -21,9 +21,28 @@ |
| 34 |
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 35 |
test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
| 36 |
RDEPEND="" |
| 37 |
- |
| 38 |
S="${WORKDIR}/${MY_P}" |
| 39 |
+# Both req'd for test phase |
| 40 |
+DISTUTILS_IN_SOURCE_BUILD=1 |
| 41 |
+DISTUTILS_NO_PARALLEL_BUILD=1 |
| 42 |
+ |
| 43 |
+python_prepare_all() { |
| 44 |
+ sed -e 's:test_file_stream:_&:' -i cherrypy/test/test_static.py || die |
| 45 |
+ distutils-r1_python_prepare_all |
| 46 |
+} |
| 47 |
|
| 48 |
python_test() { |
| 49 |
+ # https://bitbucket.org/cherrypy/cherrypy/issue/1308/testsuite-failures-x-5-test_file_stream |
| 50 |
+ if python_is_python3; then |
| 51 |
+ sed -e 's:test_HTTP11_pipelining:_&:' -i cherrypy/test/test_conn.py || die |
| 52 |
+ elif [[ "${EPYTHON}" == "pypy-c2.0" || "${EPYTHON}" == "pypy-c" ]]; then |
| 53 |
+ einfo "done" |
| 54 |
+ sed -e 's:testEscapedOutput:_&:' \ |
| 55 |
+ -e 's:testNormalReturn:_&:' \ |
| 56 |
+ -e 's:testTracebacks:_&:' \ |
| 57 |
+ -e 's:testNormalYield:_&:' \ |
| 58 |
+ -i cherrypy/test/test_logging.py || die |
| 59 |
+ fi |
| 60 |
+ # This really doesn't sit well with multiprocessing |
| 61 |
nosetests < /dev/tty || die "Testing failed with ${EPYTHON}" |
| 62 |
} |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.57 dev-python/cherrypy/ChangeLog |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cherrypy/ChangeLog?rev=1.57&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cherrypy/ChangeLog?rev=1.57&content-type=text/plain |
| 70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cherrypy/ChangeLog?r1=1.56&r2=1.57 |
| 71 |
|
| 72 |
Index: ChangeLog |
| 73 |
=================================================================== |
| 74 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v |
| 75 |
retrieving revision 1.56 |
| 76 |
retrieving revision 1.57 |
| 77 |
diff -u -r1.56 -r1.57 |
| 78 |
--- ChangeLog 22 Oct 2013 11:38:39 -0000 1.56 |
| 79 |
+++ ChangeLog 30 Mar 2014 13:05:38 -0000 1.57 |
| 80 |
@@ -1,6 +1,9 @@ |
| 81 |
# ChangeLog for dev-python/cherrypy |
| 82 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 83 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.56 2013/10/22 11:38:39 grobian Exp $ |
| 84 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 85 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.57 2014/03/30 13:05:38 idella4 Exp $ |
| 86 |
+ |
| 87 |
+ 30 Mar 2014; Ian Delaney <idella4@g.o> cherrypy-3.2.2-r1.ebuild: |
| 88 |
+ edit out broken tests wrt Bug #494054 by eroen |
| 89 |
|
| 90 |
22 Oct 2013; Fabian Groffen <grobian@g.o> cherrypy-3.2.2-r1.ebuild: |
| 91 |
Marked ~x64-macos, bug #487670 |
Archives