diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-09-01 10:04:43 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-09-01 10:04:43 +0000 |
| commit | 7c79323242af1e22c0f99939df0c42d6f6f18949 (patch) | |
| tree | 5d38c5b971e6f49e6d915d2758af63373053373a /dev-python/fudge | |
| parent | Stable for x86, wrt bug #468150 (diff) | |
| download | gentoo-2-7c79323242af1e22c0f99939df0c42d6f6f18949.tar.gz gentoo-2-7c79323242af1e22c0f99939df0c42d6f6f18949.tar.bz2 gentoo-2-7c79323242af1e22c0f99939df0c42d6f6f18949.zip | |
Fix the distutils-r1 ebuild.
(Portage version: 9999/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-python/fudge')
| -rw-r--r-- | dev-python/fudge/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/fudge/fudge-1.0.3-r2.ebuild (renamed from dev-python/fudge/fudge-1.0.3-r1.ebuild) | 28 |
2 files changed, 15 insertions, 21 deletions
diff --git a/dev-python/fudge/ChangeLog b/dev-python/fudge/ChangeLog index a8ac05df56ff..51a9dafce869 100644 --- a/dev-python/fudge/ChangeLog +++ b/dev-python/fudge/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/fudge # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/ChangeLog,v 1.7 2013/06/07 15:30:53 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/ChangeLog,v 1.8 2013/09/01 10:04:43 mgorny Exp $ + +*fudge-1.0.3-r2 (01 Sep 2013) + + 01 Sep 2013; Michał Górny <mgorny@gentoo.org> +fudge-1.0.3-r2.ebuild, + -fudge-1.0.3-r1.ebuild: + Fix the distutils-r1 ebuild. *fudge-0.9.6 (07 Jun 2013) diff --git a/dev-python/fudge/fudge-1.0.3-r1.ebuild b/dev-python/fudge/fudge-1.0.3-r2.ebuild index 7f637724e4fc..7f1c7a4e9d6c 100644 --- a/dev-python/fudge/fudge-1.0.3-r1.ebuild +++ b/dev-python/fudge/fudge-1.0.3-r2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-1.0.3-r1.ebuild,v 1.1 2013/06/07 15:17:52 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-1.0.3-r2.ebuild,v 1.1 2013/09/01 10:04:43 mgorny Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0) +PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 ) inherit distutils-r1 -DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing." +DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing" HOMEPAGE="http://farmdev.com/projects/fudge/ http://pypi.python.org/pypi/fudge" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" @@ -16,12 +16,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc test" -DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" RDEPEND="" -DISTUTILS_IN_SOURCE_BUILD=1 +DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( dev-python/nose[${PYTHON_USEDEP}] )" python_prepare_all() { - find -name "._*" -print0 | xargs -0 rm -f + find -name "._*" -delete || die distutils-r1_python_prepare_all } @@ -29,21 +29,9 @@ python_compile_all() { use doc && emake -C docs html } -python_compile() { - if ! use test; then - pushd $"{BUILD_DIR}"/lib > /dev/null - rm -rf ${PN}/tests/ || die - fi - distutils-r1_python_compile -} - python_test() { - if [[ "${EPYTHON}" == python3* ]]; then - pushd $"{BUILD_DIR}"../ > /dev/null - 2to3 --no-diffs build/lib/${PN}/tests - fi - nosetests -w build/lib/${PN}/tests || die - rm -rf build/lib/${PN}/tests/ || die + nosetests -w "${BUILD_DIR}"/lib/${PN}/tests \ + || die "Tests fail with ${EPYTHON}" } python_install_all() { |