commit: f978505b4c5ba7bb6c713cd23d4bda96d7d7cff3 Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> AuthorDate: Tue Sep 13 12:00:27 2016 +0000 Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> CommitDate: Tue Sep 13 12:00:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f978505b
dev-python/logilab-common: re-add timezone test-failure workaround, drop old versions Package-Manager: portage-2.3.0 dev-python/logilab-common/Manifest | 2 - .../files/logilab-common-0.60.0-skip-doctest.patch | 13 ----- .../logilab-common/logilab-common-1.0.2.ebuild | 67 ---------------------- .../logilab-common/logilab-common-1.1.0.ebuild | 67 ---------------------- .../logilab-common/logilab-common-1.2.2.ebuild | 4 ++ 5 files changed, 4 insertions(+), 149 deletions(-) diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest index 54cc476..004d0aa 100644 --- a/dev-python/logilab-common/Manifest +++ b/dev-python/logilab-common/Manifest @@ -1,4 +1,2 @@ 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-0.60.0-skip-doctest.patch b/dev-python/logilab-common/files/logilab-common-0.60.0-skip-doctest.patch deleted file mode 100644 index 019ce61..00000000 --- a/dev-python/logilab-common/files/logilab-common-0.60.0-skip-doctest.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://www.logilab.org/ticket/174440 -diff --git a/textutils.py b/textutils.py ---- a/textutils.py -+++ b/textutils.py -@@ -287,7 +287,7 @@ - >>> text_to_dict('''multiple=1 - ... multiple= 2 - ... single =3 -- ... ''') -+ ... ''') # doctest: +SKIP - {'single': '3', 'multiple': ['1', '2']} - - """ diff --git a/dev-python/logilab-common/logilab-common-1.0.2.ebuild b/dev-python/logilab-common/logilab-common-1.0.2.ebuild deleted file mode 100644 index 53c62f9..00000000 --- a/dev-python/logilab-common/logilab-common-1.0.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 eutils - -DESCRIPTION="Useful miscellaneous modules used by Logilab projects" -HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"; -SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -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" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -# egenix-mx-base tests are optional and supports python2 only. -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}] ) - 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 - -python_prepare_all() { - sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - # Based on the doc build in Arfrever's ebuild. It works - pushd doc > /dev/null - mkdir -p apidoc || die - epydoc --parse-only -o apidoc --html -v --no-private --exclude=__pkginfo__ --exclude=setup --exclude=test \ - -n "Logilab's common library" "$(ls -d ../build/lib/logilab/common/)" build \ - || die "Generation of documentation failed" - 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/. -} diff --git a/dev-python/logilab-common/logilab-common-1.1.0.ebuild b/dev-python/logilab-common/logilab-common-1.1.0.ebuild deleted file mode 100644 index 53c62f9..00000000 --- a/dev-python/logilab-common/logilab-common-1.1.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 eutils - -DESCRIPTION="Useful miscellaneous modules used by Logilab projects" -HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"; -SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -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" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -# egenix-mx-base tests are optional and supports python2 only. -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}] ) - 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 - -python_prepare_all() { - sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - # Based on the doc build in Arfrever's ebuild. It works - pushd doc > /dev/null - mkdir -p apidoc || die - epydoc --parse-only -o apidoc --html -v --no-private --exclude=__pkginfo__ --exclude=setup --exclude=test \ - -n "Logilab's common library" "$(ls -d ../build/lib/logilab/common/)" build \ - || die "Generation of documentation failed" - 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/. -} diff --git a/dev-python/logilab-common/logilab-common-1.2.2.ebuild b/dev-python/logilab-common/logilab-common-1.2.2.ebuild index 8775d9e..5ead43c 100644 --- a/dev-python/logilab-common/logilab-common-1.2.2.ebuild +++ b/dev-python/logilab-common/logilab-common-1.2.2.ebuild @@ -56,5 +56,9 @@ python_install_all() { } python_test() { + # https://www.logilab.org/ticket/149345 + # Prevent timezone related failure. + export TZ=UTC + "${PYTHON}" bin/pytest-local || die "Tests fail with ${EPYTHON}" }
