From 704f79d927617809e8f4c3f83acade4b276d33b9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 3 May 2017 19:41:02 -0700 Subject: [PATCH] bump(dev-python/astng): sync with upstream --- .../portage-stable/dev-python/astng/Manifest | 7 +- .../dev-python/astng/astng-0.21.1.ebuild | 75 ------------------- .../dev-python/astng/astng-0.24.3.ebuild | 45 +++++++++++ .../dev-python/astng/files/pypy-test.patch | 36 +++++++++ .../dev-python/astng/metadata.xml | 22 ++++++ .../md5-cache/dev-python/astng-0.21.1 | 13 ---- .../md5-cache/dev-python/astng-0.24.3 | 15 ++++ 7 files changed, 124 insertions(+), 89 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/astng/astng-0.21.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/astng/astng-0.24.3.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/astng/files/pypy-test.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/astng/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/astng-0.21.1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/astng-0.24.3 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astng/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/astng/Manifest index b5dd70e845..cfcd5de902 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/astng/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/astng/Manifest @@ -1 +1,6 @@ -DIST logilab-astng-0.21.1.tar.gz 99399 RMD160 3863bf4242f5cf94de68ba8dce291f70d46a4d63 SHA1 d26083973b540faaa8cde4f93968afa464810f67 SHA256 7bb3000f670ce473c3060081661894942c8bdb38ba9f0d599bf257357e14c7db +AUX pypy-test.patch 1863 SHA256 261e06853dab43c55def0dc86a8380a80faf3e3364287850f6b9764d801419da SHA512 474805cd55ae930b3d2f0595549b74f8a718ad21de016204367f5513d69afc5a6ad4f43b44162a5b752a820f642ef5600c2c3f7e7111839b1d3ef0d95a7819ad WHIRLPOOL 14c14112d7c9def7096f97a44fedd82b5b042c96e098210cc4c6fb07502a702f5c86130e134d291f8754e8cc00a74733b972ebc84b36496bc74be945add2060b +DIST logilab-astng-0.24.3.tar.gz 106660 SHA256 e08fba39689e5a4dfa175749874811e516f019656544874defe05154073f69d4 SHA512 fb1e46ebf7111d727cd9d187968cb349dc23dfba0d4d8c6c793a8c081d4506f11e488074cc51b632c525aa264cfa50279dda90f0cf35dc2120ebbf4714902525 WHIRLPOOL 75941724a2c4448a27b37750a83dbc04e4a02540233418b0eab364a3ddfdc3a5e03efacc58422d7fb6f68609f126e269c662aa17dbc395067b45182155559589 +EBUILD astng-0.24.3.ebuild 1470 SHA256 522e6094ab307ca758c6f6735d74f6c0c4bdaf16e9793dfcb645f50106ae2ce4 SHA512 d9023e522a2d1961150f5b14f96b290497f1ccb70166846860f585de6d8c7b063124e214c335e74938b364342c3bb58239bfee7615853712efd2adc6e3b49b71 WHIRLPOOL 1662120f92ead832edeaa033b0b0d783d1b8ada1fc10083e47fad90fcc05ae38346586bf4d51bf319524e18ff3734283c5fd3120f6a03a35f92a8e209ae483c9 +MISC ChangeLog 2718 SHA256 82bf6c1466a737d504f60c57b1c4fcecb9cce06a74137887a5943aa40038120b SHA512 30a3a4a29d14e2ab173ebcdccab77f970cf7834831ad74d43e6d3609a60a06d84c9a1fb01104fc5475911a21c6eb225f8d2826862753d0ee1e66de62ddb046d0 WHIRLPOOL d31d1ec225f646ad18f6ada54aa5b1bb282daebe8698cddb407b623b7ba63f544ed0321541874e6a9cf40133ab2cdb55e4ada66b6900cb219cc75d4c1fc18f7e +MISC ChangeLog-2015 11553 SHA256 7b1f5e7f02aa7b6f089102d59c0b0506a7480d1b3186ac10b312874710ccb580 SHA512 ae2ea264f0e7d588f84107bd4e85b3cb970b1515b6fcb84bf2d2ac77c1b6a62cd8bd9187620913a52b4221a3bd5d9a68e3202020c4dc7c229aaae195f9bedfdc WHIRLPOOL 107957bb3a95c57df29b29e2cffb85058e1e544324db4adf55237cb8510685b68e66859c505b8a7cdb325cc114cf33fff24f127e1ea82eaa1bdea7bb0bb94c93 +MISC metadata.xml 1068 SHA256 805aa8de63143d3ad9be5539436bb67a5b8ed8f53a27571c39e5bff838de30dc SHA512 c31304cd3895351242c47fef547bc6277421cc634b63862bbb84de081b0638a3020a6347510fff386d78aad432ee6382f8d7f4e1766aa1af32c2b44e83425cc2 WHIRLPOOL ef1441f5ccdea220f5e2838cfda96a0ae22740213fbd0c1a18ebb9c45757fb5818c40af60873a714b744b4e8acc9638bd5e28b3c2ed2eef15dfeba1ea0ac2df6 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astng/astng-0.21.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astng/astng-0.21.1.ebuild deleted file mode 100644 index ab62c9f365..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/astng/astng-0.21.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.21.1.ebuild,v 1.1 2011/01/17 22:53:07 arfrever Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -DESCRIPTION="Abstract Syntax Tree New Generation for logilab packages" -HOMEPAGE="http://www.logilab.org/projects/astng/ http://pypi.python.org/pypi/logilab-astng" -SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" -IUSE="test" - -# Version specified in __pkginfo__.py. -RDEPEND=">=dev-python/logilab-common-0.53.0" -DEPEND="${RDEPEND} - dev-python/setuptools - test? ( >=dev-python/egenix-mx-base-3.0.0 )" - -S="${WORKDIR}/logilab-${P}" - -DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1" - -PYTHON_MODNAME="logilab/astng" - -src_prepare() { - distutils_src_prepare - - conversion() { - [[ "${PYTHON_ABI}" == 2.* ]] && return - find -name "*.py" ! -name "setup.py" -print | xargs 2to3-${PYTHON_ABI} -nw --no-diffs - } - python_execute_function -s conversion -} - -src_test() { - testing() { - local tpath="${T}/test-${PYTHON_ABI}" - local spath="${tpath}$(python_get_sitedir)" - - mkdir -p "${spath}/logilab" || return 1 - cp -r "$(python_get_sitedir)/logilab/common" "${spath}/logilab" || return 1 - - "$(PYTHON)" setup.py install --root="${tpath}" || die "Installation for tests failed with $(python_get_implementation) $(python_get_version)" - - # pytest uses tests placed relatively to the current directory. - pushd "${spath}/logilab/astng" > /dev/null || return 1 - if [[ "${PYTHON_ABI}" == 3.* ]]; then - # Support for Python 3 is experimental. Some tests are known to fail. - PYTHONPATH="${spath}" pytest -v - else - PYTHONPATH="${spath}" pytest -v || return 1 - fi - popd > /dev/null || return 1 - } - python_execute_function -s testing -} - -src_install() { - distutils_src_install - - deletion_of_unneeded_files() { - # Avoid collision with dev-python/logilab-common. - rm -f "${ED}$(python_get_sitedir)/logilab/__init__.py" || return 1 - - # Don't install tests. - rm -fr "${ED}$(python_get_sitedir)/logilab/astng/test" || return 1 - } - python_execute_function -q deletion_of_unneeded_files -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astng/astng-0.24.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astng/astng-0.24.3.ebuild new file mode 100644 index 0000000000..3026a1ad64 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astng/astng-0.24.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Abstract Syntax Tree for logilab packages" +HOMEPAGE="http://www.logilab.org/project/logilab-astng https://pypi.python.org/pypi/logilab-astng" +SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos" +IUSE="test" + +# Version specified in __pkginfo__.py. +RDEPEND=">=dev-python/logilab-common-0.59.0[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep 'python2*')] )" + +S="${WORKDIR}/logilab-${P}" +RESTRICT="test" # erroneous failures + +# a wit; pypy reports astng modules differently +PATCHES=( "${FILESDIR}"/pypy-test.patch ) + +python_test() { + distutils_install_for_testing + # test target needs unpacked test directories, doesn't like binary egg + esetup.py install_lib --install-dir="${TEST_DIR}"/lib + #https://bitbucket.org/logilab/astroid/issue/1/test-suite-fails-in-0243-under-py32-pypy + # Make sure that the tests use correct modules. + cd "${TEST_DIR}"/lib || die + pytest -v || die "Tests fail with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install + + rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astng/files/pypy-test.patch b/sdk_container/src/third_party/portage-stable/dev-python/astng/files/pypy-test.patch new file mode 100644 index 0000000000..42cb3864b4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astng/files/pypy-test.patch @@ -0,0 +1,36 @@ +diff -ur logilab-astng-0.24.3.orig/test/unittest_builder.py logilab-astng-0.24.3/test/unittest_builder.py +--- test/unittest_builder.py 2013-04-17 17:38:31.000000000 +0800 ++++ test/unittest_builder.py 2013-06-19 02:13:51.425269363 +0800 +@@ -62,8 +62,12 @@ + self.assertEqual(name.tolineno, 4) + strarg = callfunc.args[0] + self.assertIsInstance(strarg, nodes.Const) +- self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually) +- self.assertEqual(strarg.tolineno, 5) ++ if hasattr(sys, 'pypy_version_info'): ++ self.assertEqual(strarg.fromlineno, 4) # no way for this one (is 4 actually) ++ self.assertEqual(strarg.tolineno, 4) ++ else: ++ self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually) ++ self.assertEqual(strarg.tolineno, 5) + namearg = callfunc.args[1] + self.assertIsInstance(namearg, nodes.Name) + self.assertEqual(namearg.fromlineno, 5) +diff -ur logilab-astng-0.24.3.orig/test/unittest_inference.py logilab-astng-0.24.3/test/unittest_inference.py +--- test/unittest_inference.py 2013-04-17 17:38:31.000000000 +0800 ++++ test/unittest_inference.py 2013-06-19 02:52:41.618270007 +0800 +@@ -710,8 +710,12 @@ + node = get_name_node(astng, 'open', -1) + infered = list(node.infer()) + self.assertEqual(len(infered), 1) +- self.assertIsInstance(infered[0], nodes.Function) +- self.assertEqual(infered[0].name, 'open') ++ if hasattr(sys, 'pypy_version_info'): ++ self.assertIsInstance(infered[0], nodes.Class) ++ self.assertEqual(infered[0].name, 'file') ++ else: ++ self.assertIsInstance(infered[0], nodes.Function) ++ self.assertEqual(infered[0].name, 'open') + + def test_callfunc_context_func(self): + code = ''' diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astng/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/astng/metadata.xml new file mode 100644 index 0000000000..b7ac41e3d5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astng/metadata.xml @@ -0,0 +1,22 @@ + + + + + python@gentoo.org + Python + + The aim of this module is to provide a common base representation of + python source code for projects such as pychecker, pyreverse, + pylint... Well, actually the development of this library is + essentially governed by pylint's needs. + It provides a compatible representation which comes from the _ast + module. It rebuilds the tree generated by the builtin _ast module by + recursively walking down the AST and building an extended ast (let's + call it astng ;). The new node classes have additional methods and + attributes for different usages. They include some support for static + inference and local name scopes. Furthermore, astng builds partial + trees by inspecting living objects. + + logilab-astng + + diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/astng-0.21.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/astng-0.21.1 deleted file mode 100644 index 1d7164c4c7..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/astng-0.21.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare test -DEPEND=>=dev-python/logilab-common-0.53.0 dev-python/setuptools test? ( >=dev-python/egenix-mx-base-3.0.0 ) dev-lang/python -DESCRIPTION=Abstract Syntax Tree New Generation for logilab packages -EAPI=3 -HOMEPAGE=http://www.logilab.org/projects/astng/ http://pypi.python.org/pypi/logilab-astng -IUSE=test -KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos -LICENSE=LGPL-2.1 -RDEPEND=>=dev-python/logilab-common-0.53.0 dev-lang/python -SLOT=0 -SRC_URI=ftp://ftp.logilab.org/pub/astng/logilab-astng-0.21.1.tar.gz mirror://pypi/l/logilab-astng/logilab-astng-0.21.1.tar.gz -_eclasses_=distutils ad9e4720eb3e69090dd968b152fc611b multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=039bfd2ffc518979a5853cad7b3cfafd diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/astng-0.24.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/astng-0.24.3 new file mode 100644 index 0000000000..fc92810e2b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/astng-0.24.3 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=dev-python/logilab-common-0.59.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/egenix-mx-base-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] +DESCRIPTION=Abstract Syntax Tree for logilab packages +EAPI=5 +HOMEPAGE=http://www.logilab.org/project/logilab-astng https://pypi.python.org/pypi/logilab-astng +IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 +KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos +LICENSE=LGPL-2.1 +RDEPEND=>=dev-python/logilab-common-0.59.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] +REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) +RESTRICT=test +SLOT=0 +SRC_URI=ftp://ftp.logilab.org/pub/astng/logilab-astng-0.24.3.tar.gz mirror://pypi/l/logilab-astng/logilab-astng-0.24.3.tar.gz +_eclasses_=distutils-r1 039ba10839816478cfb070fdeb053906 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 0c067f080a047742ffac024b16895b45 python-utils-r1 c11fc374357e6ad9ddfe2e9f931e4d29 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120 +_md5_=6311e1b940a1d3742c9f11269ac9a834