Version bump. Clean up python_test.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

2 files changed, 50 insertions, 1 deletions

diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 564bd5d0893c..ed74f820edef 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.58 2014/03/31 20:48:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.59 2014/04/05 17:07:00 floppym Exp $
+
+*cherrypy-3.2.5 (05 Apr 2014)
+
+  05 Apr 2014; Mike Gilbert <floppym@gentoo.org> +cherrypy-3.2.5.ebuild:
+  Version bump. Clean up python_test.
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> cherrypy-3.2.2-r1.ebuild:
   Add support for the new PyPy slotting.
diff --git a/dev-python/cherrypy/cherrypy-3.2.5.ebuild b/dev-python/cherrypy/cherrypy-3.2.5.ebuild
new file mode 100644
index 000000000000..02dd27cf4a43
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-3.2.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.5.ebuild,v 1.1 2014/04/05 17:07:00 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy pypy2_0 )
+
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent interactive failures (hangs) in the test suite
+	sed -i -e "s/interactive = True/interactive = False/" cherrypy/test/webtest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Failure in test_file_stream
+	# https://bitbucket.org/cherrypy/cherrypy/issue/1308/testsuite-failures-x-5-test_file_stream
+
+	# This really doesn't sit well with multiprocessing
+	nosetests -e test_file_stream < /dev/tty || die "Testing failed with ${EPYTHON}"
+}
+
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}