summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-01-23 15:57:13 +0000
committerMichał Górny <mgorny@gentoo.org>2013-01-23 15:57:13 +0000
commitac3b7084f7c072d5b6619681c79fc5b90a9ad295 (patch)
tree4de11a4f0e0180a677ffedeba6ff6a1e93cc55b2
parentVersion bump to 4.0rc2. Remove rc1. (diff)
downloadgentoo-2-ac3b7084f7c072d5b6619681c79fc5b90a9ad295.tar.gz
gentoo-2-ac3b7084f7c072d5b6619681c79fc5b90a9ad295.tar.bz2
gentoo-2-ac3b7084f7c072d5b6619681c79fc5b90a9ad295.zip
Fix installing "tests" module.
(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
-rw-r--r--dev-python/redis-py/ChangeLog5
-rw-r--r--dev-python/redis-py/redis-py-2.7.2-r1.ebuild11
2 files changed, 9 insertions, 7 deletions
diff --git a/dev-python/redis-py/ChangeLog b/dev-python/redis-py/ChangeLog
index e046e44805a2..f9e392eb0b88 100644
--- a/dev-python/redis-py/ChangeLog
+++ b/dev-python/redis-py/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/redis-py
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/ChangeLog,v 1.31 2013/01/13 12:28:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/ChangeLog,v 1.32 2013/01/23 15:57:13 mgorny Exp $
+
+ 23 Jan 2013; Michał Górny <mgorny@gentoo.org> redis-py-2.7.2-r1.ebuild:
+ Fix installing "tests" module.
*redis-py-2.7.2-r1 (13 Jan 2013)
diff --git a/dev-python/redis-py/redis-py-2.7.2-r1.ebuild b/dev-python/redis-py/redis-py-2.7.2-r1.ebuild
index 4a2c62b5be47..a325e5753db8 100644
--- a/dev-python/redis-py/redis-py-2.7.2-r1.ebuild
+++ b/dev-python/redis-py/redis-py-2.7.2-r1.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/redis-py/redis-py-2.7.2-r1.ebuild,v 1.1 2013/01/13 12:28:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.2-r1.ebuild,v 1.2 2013/01/23 15:57:13 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
@@ -41,15 +41,13 @@ python_compile() {
distutils-r1_python_compile
if use test; then
- cp -r tests-hidden "${BUILD_DIR}"/lib/tests || die
+ cp -r tests-hidden "${BUILD_DIR}"/tests || die
fi
}
src_test() {
# local DISTUTILS_NO_PARALLEL_BUILD=1
- # moved to BUILD_DIR
- rm -rf tests
distutils-r1_src_test
}
@@ -58,7 +56,7 @@ python_test() {
local sock=${T}/redis-${EPYTHON}.sock
sed -i -e "s:port=6379:unix_socket_path=\"${sock}\":" \
- "${BUILD_DIR}"/lib/tests/*.py || die
+ "${BUILD_DIR}"/tests/*.py || die
# XXX: find a way to make sure it is killed
@@ -67,6 +65,7 @@ python_test() {
--port 0 \
--unixsocket "${sock}" \
--daemonize yes || die
- esetup.py test
+ PYTHONPATH="${PYTHONPATH}:${BUILD_DIR}" \
+ esetup.py test
kill "$(<"${pidfile}")"
}