[gentoo-commits] gentoo-x86 commit in dev-python/django-tastypie: django-tastypie-0.9.15.ebuild

[Ian Delaney (idella4)]

idella4     13/06/03 07:08:29

  Modified:             django-tastypie-0.9.15.ebuild
  Log:
  Added needed deps, tarball from pypi substituted with 'proper' one from home site, patch for running testsuite to die on fail (shifts code from ebuild back to run script), test phase reduced to run on 1 line
  
  (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

Revision  Changes    Path
1.3                  dev-python/django-tastypie/django-tastypie-0.9.15.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild?r1=1.2&r2=1.3

Index: django-tastypie-0.9.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- django-tastypie-0.9.15.ebuild	30 May 2013 21:16:59 -0000	1.2
+++ django-tastypie-0.9.15.ebuild	3 Jun 2013 07:08:29 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild,v 1.2 2013/05/30 21:16:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild,v 1.3 2013/06/03 07:08:29 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,8 @@
 
 DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
 HOMEPAGE="http://pypi.python.org/pypi/django-tastypie/ https://github.com/toastdriven/django-tastypie"
-SRC_URI="https://github.com/toastdriven/django-tastypie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/toastdriven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 KEYWORDS="~amd64 ~x86"
 IUSE="bip doc digest lxml oauth test yaml"
 
@@ -17,12 +18,14 @@
 SLOT="0"
 
 RDEPEND=">=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	!=dev-python/python-dateutil-2.0
-	dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	>=dev-python/django-1.3[${PYTHON_USEDEP}]
+	dev-python/pyxml[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
 	bip? ( dev-python/biplist[${PYTHON_USEDEP}] )
 	digest? ( dev-python/python-digest[${PYTHON_USEDEP}] )
-	oauth? ( dev-python/oauth2[${PYTHON_USEDEP}] dev-python/django-oauth-plus[${PYTHON_USEDEP}] )
+	oauth? ( dev-python/oauth2[${PYTHON_USEDEP}]
+		dev-python/django-oauth-plus[${PYTHON_USEDEP}] )
 	lxml? ( dev-python/lxml[${PYTHON_USEDEP}] )
 	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
@@ -37,10 +40,13 @@
 		>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
+	)"
 
-RESTRICT="test"
+python_prepare_all() {
+	# skip run tests script
+	use test && epatch "${FILESDIR}"/runtests.patch
+	distutils-r1_python_prepare_all
+}
 
 python_compile_all() {
 	use doc && emake -C docs html
@@ -51,20 +57,7 @@
 }
 
 python_test() {
-	# See tests/run_all_tests.sh
-	local types=( core basic alphanumeric slashless namespaced related
-		validation gis content_gfk authorization )
-	local failed type
-
-	pushd tests > /dev/null || die
-	for type in "${types[@]}"; do
-		set -- django-admin.py test ${type} --settings=settings_${type}
-		echo "$@"
-		"$@" || failed=1
-	done
-	popd > /dev/null || die
-
-	[[ -z ${failed} ]] || die "Testing failed with ${EPYTHON}"
+	PYTHONPATH=.:tests ./tests/run_all_tests.sh
 }
 
 python_install_all() {