Use github tarball and actually run tests. XML related tests currently fail.

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

2 files changed, 21 insertions, 18 deletions

diff --git a/dev-python/django-compressor/ChangeLog b/dev-python/django-compressor/ChangeLog
index e0795af14736..88899916590f 100644
--- a/dev-python/django-compressor/ChangeLog
+++ b/dev-python/django-compressor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django-compressor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/ChangeLog,v 1.3 2013/05/29 11:54:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/ChangeLog,v 1.4 2013/05/31 03:04:44 floppym Exp $
+
+  31 May 2013; Mike Gilbert <floppym@gentoo.org> django-compressor-1.3.ebuild:
+  Use github tarball and actually run tests. XML related tests currently fail.
 
 *django-compressor-1.3 (29 May 2013)
 
diff --git a/dev-python/django-compressor/django-compressor-1.3.ebuild b/dev-python/django-compressor/django-compressor-1.3.ebuild
index a0459bf9261c..62f85e204998 100644
--- a/dev-python/django-compressor/django-compressor-1.3.ebuild
+++ b/dev-python/django-compressor/django-compressor-1.3.ebuild
@@ -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-compressor/django-compressor-1.3.ebuild,v 1.1 2013/05/29 11:54:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/django-compressor-1.3.ebuild,v 1.2 2013/05/31 03:04:44 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="${PN/-/_}"
 DESCRIPTION="Allows to define regrouped/postcompiled content 'on the fly' inside of django template"
 HOMEPAGE="http://pypi.python.org/pypi/django_compressor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jezdez/django_compressor/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
@@ -21,28 +21,28 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 RDEPEND=">=dev-python/django-1.1.4[${PYTHON_USEDEP}]
 	>=dev-python/django-appconf-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/versiontools[${PYTHON_USEDEP}]
-	test? ( dev-python/twill[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/django-discover-runner[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
 
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
 python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	export SECRET_KEY="green"
-	local test
-	for test in compressor/tests/test_*.py
-	do
-		if "${PYTHON}" -c \
-			"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" ${test}
-		then
-			einfo "Test ${test} completed under ${EPYTHON}"
-		else
-			die "${test} failed with Python ${EPYTHON}"
-		fi
-	done
+	set -- django-admin.py test compressor --settings=compressor.test_settings
+	echo "$@"
+	"$@" || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {