From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4D8C758973 for ; Mon, 25 Jan 2016 15:12:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 273D921C04A; Mon, 25 Jan 2016 15:11:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FF5221C010 for ; Mon, 25 Jan 2016 15:11:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2ADE9340A35 for ; Mon, 25 Jan 2016 15:11:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 188F5102F for ; Mon, 25 Jan 2016 15:11:55 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1453734701.d038638f1e09d93257a3bd8926124dda008beeec.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/setuptools/Manifest dev-python/setuptools/setuptools-19.6.ebuild dev-python/setuptools/setuptools-9999.ebuild X-VCS-Directories: dev-python/setuptools/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d038638f1e09d93257a3bd8926124dda008beeec X-VCS-Branch: master Date: Mon, 25 Jan 2016 15:11:55 +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: 8853bb15-4526-4178-b5ca-d09d1fe6230d X-Archives-Hash: 77e96629e6eaebe4bf2fef824b4651b9 commit: d038638f1e09d93257a3bd8926124dda008beeec Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 25 11:59:33 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 25 15:11:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d038638f dev-python/setuptools: Version Bump Propargate changes to live ebuild Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> dev-python/setuptools/Manifest | 1 + ...tuptools-9999.ebuild => setuptools-19.6.ebuild} | 41 ++++++++++-------- dev-python/setuptools/setuptools-9999.ebuild | 48 +++++++++++++--------- 3 files changed, 53 insertions(+), 37 deletions(-) diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index b563c99..d3c5ff9 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -8,3 +8,4 @@ DIST setuptools-18.8.tar.gz 629367 SHA256 04180e33a40a114ff9b458f31786d885964612 DIST setuptools-19.1.1.tar.gz 640997 SHA256 32ebb08b72aee11fefa6907ddf5db5a81e0eef9cf62c7fa6b58d8e32da249960 SHA512 480aaed577ab9bc4d3cae71d957407ecb71e743dab7fb06f165b76683445f356ce141e1057b5a057101f9546df8c62e2abc2c35ebd751e4bb3febb846a71ac41 WHIRLPOOL 608af5cb22e9b87de3cb0181519058cc7437b7e74b7be4774337d18a562e869cb361edf17f0488c2594039e87dcdc1f201723520568490b0e0be105992abeb37 DIST setuptools-19.2.tar.gz 641777 SHA256 f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a SHA512 2494606930d6d422e8c105e8e5b40a07b23709f361164c5df40ff24c80328b861179652c7212fa38137534206c187bc4de42d249bc686d43fad18f23d0a26126 WHIRLPOOL ee861dc97a48ec7a07eadc3ceb42077b396a14c1448f0c3d8c6edf2266f4da241bb0e9f31922bc687b6e943802b95b440aea9f2e5d60b8d338c8392102353100 DIST setuptools-19.4.tar.gz 641797 SHA256 214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf SHA512 463a2b00193b972e684569dce1527b34d7be9a9d0f866fd8a0c2c1a475558c539148841ca117b0a9c5507d8344dfd5ca515bc6beee59b44c6e8bf05771bc448a WHIRLPOOL 37bdb6592e63c8594051ddfa1df4295dc3417e29b338f66a44270619bf30c6e87b12a7086a8f337f3497bd036cbacc10ab2f179c2768af685b6ee5d93a747897 +DIST setuptools-19.6.tar.gz 641502 SHA256 ecd48d753c1a8ecc6a2826b863a6defaafbfd4ceafc0c1d62e5362f5a86912e9 SHA512 79b9a0f595bda16f18997d9937c6bc2e21bb2bb23fcca4be29df2fb71649c5ba973428472e3c795f2a5d6fbcccf1d5f29096a0fb593a4c52fa87b1d003e474da WHIRLPOOL 391f3e20739c717cc42613e099b867ee01cd8a1f3623f31062dee23131c3b1bad2e34345348f76e44ff2b92652cf65931b3fd8b6a7663b9c135a7c03b6954405 diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-19.6.ebuild similarity index 58% copy from dev-python/setuptools/setuptools-9999.ebuild copy to dev-python/setuptools/setuptools-19.6.ebuild index 3364976..3004253 100644 --- a/dev-python/setuptools/setuptools-9999.ebuild +++ b/dev-python/setuptools/setuptools-19.6.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 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 pypy3 ) +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 -#if LIVE -inherit mercurial -#endif -DESCRIPTION="a collection of extensions to Distutils" +DESCRIPTION="Collection of extensions to Distutils" HOMEPAGE="https://pypi.python.org/pypi/setuptools" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -LICENSE="PSF-2" +LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" -#if LIVE -SRC_URI="" -KEYWORDS="" -EHG_REPO_URI="https://bitbucket.org/pypa/setuptools" -#endif -DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )" +RDEPEND=" + >=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + test? ( + >=dev-python/pytest-2.8[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" # Force in-source build because build system modifies sources. DISTUTILS_IN_SOURCE_BUILD=1 @@ -32,8 +35,12 @@ DISTUTILS_IN_SOURCE_BUILD=1 DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) python_prepare_all() { - # Disable tests requiring network connection. - rm -f setuptools/tests/test_packageindex.py + rm -r ./pkg_resources/_vendor || die + # disable tests requiring a network connection + rm setuptools/tests/test_packageindex.py || die + + # don't run integration tests + rm setuptools/tests/test_integration.py || die distutils-r1_python_prepare_all } @@ -41,7 +48,7 @@ python_prepare_all() { python_test() { # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg # It tries to sandbox the test in a tempdir - HOME="${PWD}" esetup.py test + HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" } python_install() { diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild index 3364976..972ed4c 100644 --- a/dev-python/setuptools/setuptools-9999.ebuild +++ b/dev-python/setuptools/setuptools-9999.ebuild @@ -1,30 +1,34 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 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 pypy3 ) +EAPI=6 -inherit distutils-r1 -#if LIVE -inherit mercurial -#endif +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) -DESCRIPTION="a collection of extensions to Distutils" +inherit distutils-r1 mercurial + +DESCRIPTION="Collection of extensions to Distutils" HOMEPAGE="https://pypi.python.org/pypi/setuptools" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="" +EHG_REPO_URI="https://bitbucket.org/pypa/setuptools" -LICENSE="PSF-2" +LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -#if LIVE -SRC_URI="" KEYWORDS="" -EHG_REPO_URI="https://bitbucket.org/pypa/setuptools" -#endif +IUSE="test" -DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )" +RDEPEND=" + >=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + test? ( + >=dev-python/pytest-2.8[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" # Force in-source build because build system modifies sources. DISTUTILS_IN_SOURCE_BUILD=1 @@ -32,8 +36,12 @@ DISTUTILS_IN_SOURCE_BUILD=1 DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) python_prepare_all() { - # Disable tests requiring network connection. - rm -f setuptools/tests/test_packageindex.py + rm -r ./pkg_resources/_vendor || die + # disable tests requiring a network connection + rm setuptools/tests/test_packageindex.py || die + + # don't run integration tests + rm setuptools/tests/test_integration.py || die distutils-r1_python_prepare_all } @@ -41,7 +49,7 @@ python_prepare_all() { python_test() { # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg # It tries to sandbox the test in a tempdir - HOME="${PWD}" esetup.py test + HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" } python_install() {