From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C3B87138330 for ; Tue, 13 Sep 2016 11:42:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB72EE0A84; Tue, 13 Sep 2016 11:42:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB53AE0A84 for ; Tue, 13 Sep 2016 11:42:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E57133D3C7 for ; Tue, 13 Sep 2016 11:42:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0722E2475 for ; Tue, 13 Sep 2016 11:42:27 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: <1473766938.e00318ae92767cf5460c50b21b5516bc8818a6d9.dev-zero@gentoo> Subject: [gentoo-commits] dev/dev-zero:master commit in: dev-python/logilab-common/files/, dev-python/logilab-common/ X-VCS-Repository: dev/dev-zero X-VCS-Files: dev-python/logilab-common/Manifest dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch dev-python/logilab-common/logilab-common-1.1.0-r1.ebuild dev-python/logilab-common/logilab-common-1.2.2.ebuild X-VCS-Directories: dev-python/logilab-common/ dev-python/logilab-common/files/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: e00318ae92767cf5460c50b21b5516bc8818a6d9 X-VCS-Branch: master Date: Tue, 13 Sep 2016 11:42:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 31bef8b0-1545-466c-9c98-efd29dbe5cf4 X-Archives-Hash: 1e8b7207ec02b86894874de6d4074494 commit: e00318ae92767cf5460c50b21b5516bc8818a6d9 Author: Tiziano Müller gentoo org> AuthorDate: Tue Sep 13 11:42:18 2016 +0000 Commit: Tiziano Müller gentoo org> CommitDate: Tue Sep 13 11:42:18 2016 +0000 URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=e00318ae dev-python/logilab-common: version bump (including text fix) dev-python/logilab-common/Manifest | 4 +- .../logilab-common-1.2.2-test-namespace-fix.patch | 21 ++++++++++ ...1.1.0-r1.ebuild => logilab-common-1.2.2.ebuild} | 46 ++++++++++------------ 3 files changed, 42 insertions(+), 29 deletions(-) diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest index 078327d..4b27e18 100644 --- a/dev-python/logilab-common/Manifest +++ b/dev-python/logilab-common/Manifest @@ -1,3 +1 @@ -DIST logilab-common-0.63.2.tar.gz 196789 SHA256 603ba00c9bb09219a3bd2906c214d9455481110dacc472f450b53d5ae90f28e7 SHA512 e4b089387ab7d5d039ec719e736711f54af8d722be4ea0a933014375fe353045528c3c74c3feb6868aefe4a867223c483985fb1415aabe25dba1d333d1afbdb9 WHIRLPOOL d937ebb1f20c2bb040552bf32afc767f4238c21cb995583f9f19404c9a22bec634889a684a9fecfb70b2a17803cd4df6507dc5a74b6ae9ee4d04759d724bb687 -DIST logilab-common-1.0.2.tar.gz 190912 SHA256 3f847b36f6c03ffc8521ed61e691501c9713f8654964b90201f2056742d38300 SHA512 12caab49851ee1f335b9de19892ad26a1459308f9b8ad7b1270d4563d6afa05138be5cc7b21c7d4ff311d7da5348bf2929042d4db4e0e629413236ae4432f54b WHIRLPOOL 44ba64f36b89aa6fd8acce39944f5f3eaa438b9a923e322a8f19464b28b7b5c2d0692f49e382e8281cae093e18a102879e18b5f647d267749165e8904be19b64 -DIST logilab-common-1.1.0.tar.gz 184529 SHA256 9614fdddab90b1170d210c55f67f42584344b2a5fd6091fe4ac142069b08a4ad SHA512 a5fd3c5156cb0283e252a48fe84c66c721bc3407a6ea52e9f53ae0854e1a6d41ab4a8c60581aa187a2fa473c5ecc399ca32e98d972740b85067f8c52254132fa WHIRLPOOL 43f0197499ccbcf9afb9dfa7de33f16a852bac1ba38bd8ec1cd7dd5b0bc12c24f3ac203dabc2161d8eaa2b5d04e5a8ddab4a1f3e8bed99f7b8e0e9797d16a460 +DIST logilab-common-1.2.2.tar.gz 184817 SHA256 62b0d88d9276e86b48c7188cea8d91d8ff1744d046ea6323d40359aa53aef708 SHA512 9c2161e8644e50cb3d4418430ca95363363e532b286d39cbdb73a51274bee02e5e8d0632b7564049243f497df96102c90ab0aeff9c91e91f7275407a6cfc56e2 WHIRLPOOL d683d92c472640c7167b3ec3c6c4d80eca91f0d3b649223d172999a1c6dd7c004fd52dd016f9682405aa8ca2204273e21b9c486fa0e97f04228e270193b108e5 diff --git a/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch b/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch new file mode 100644 index 0000000..044fc67 --- /dev/null +++ b/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch @@ -0,0 +1,21 @@ +diff --git a/bin/pytest-local b/bin/pytest-local +new file mode 100755 +index 0000000..a2b771b +--- /dev/null ++++ b/bin/pytest-local +@@ -0,0 +1,15 @@ ++#!/usr/bin/env python ++ ++import sys ++try: ++ # remove an already installed logilab-common module from ++ # the list of namespaces to force the local module to be tested ++ del sys.modules['logilab'] ++except KeyError: ++ pass ++ ++import warnings ++warnings.simplefilter('default', DeprecationWarning) ++ ++from logilab.common.pytest import run ++run() diff --git a/dev-python/logilab-common/logilab-common-1.1.0-r1.ebuild b/dev-python/logilab-common/logilab-common-1.2.2.ebuild similarity index 59% rename from dev-python/logilab-common/logilab-common-1.1.0-r1.ebuild rename to dev-python/logilab-common/logilab-common-1.2.2.ebuild index 9631a91..a42d4f1 100644 --- a/dev-python/logilab-common/logilab-common-1.1.0-r1.ebuild +++ b/dev-python/logilab-common/logilab-common-1.2.2.ebuild @@ -4,10 +4,10 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) +PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 eutils +inherit distutils-r1 DESCRIPTION="Useful miscellaneous modules used by Logilab projects" HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common" @@ -16,22 +16,25 @@ SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="test doc" +IUSE="doc test" -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -# egenix-mx-base tests are optional and supports python2 only. +RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - >=dev-python/six-1.4.0[${PYTHON_USEDEP}] - test? ( $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) - dev-python/pytz[${PYTHON_USEDEP}] ) + test? ( + $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) + dev-python/pytz[${PYTHON_USEDEP}] + ) doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) )" -# Req'd for impl specific failures in the testsuite -DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( "${FILESDIR}/${P}-test-namespace-fix.patch" ) python_prepare_all() { - sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die + sed -i \ + -e 's:(CURDIR):{S}/${P}:' \ + doc/makefile || die + distutils-r1_python_prepare_all } @@ -46,22 +49,13 @@ python_compile_all() { fi } -python_test() { - distutils_install_for_testing - - # https://www.logilab.org/ticket/149345 - # Prevent timezone related failure. - export TZ=UTC - - # Make sure that the tests use correct modules. - pushd "${TEST_DIR}"/lib > /dev/null || die - "${TEST_DIR}"/scripts/pytest || die "Tests fail with ${EPYTHON}" - popd > /dev/null || die -} - python_install_all() { distutils-r1_python_install_all doman doc/pytest.1 - use doc && dohtml -r doc/apidoc/. + use doc && HTML_DOCS=( doc/apidoc/. ) +} + +python_test() { + "${PYTHON}" bin/pytest-local || die "Tests fail with ${EPYTHON}" }