gentoo resync : 10.02.2019

6 files changed, 84 insertions, 115 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index b00bc3361f30..d7787b4415bd 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,9 @@
+AUX astroid-2.1.0-fix-tests.patch 636 BLAKE2B 5a4735a5e5b804dea467f714f03138d832ff31318ef479de7723537433750e831137d8a400aebfaabaf931c9d0a46d208238bfc362a3e108852b7f5a3d1e68ef SHA512 781d4682e2d0e7885033e20c0baed755e6b8df3a6557e985e130b94c88eeb7908bf5f2ae81dccd73dd5725221ce882070a45a8c0ee7970b3e4fdb403aa2dccdb
+AUX astroid-2.1.0-no-pytest-runner.patch 474 BLAKE2B fde7f34aa9e1feefb29bf0a993bdd451523ccfa30bcd8726d36c4b159d849536445599f8f794e6cac71e71ff6b68e8cd3af4d3d5ad1ecdf9936977ec92e29536 SHA512 9c8ff2d8b2ae67620fe38d9f454c77216c2291a7f2aa59d9c78abd5a76f72aabd8154b12055aacbbabdc10fc466f57e09ed5527f796df8e6a5a15bfefaa4f0f0
 DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
-DIST astroid-1.5.3.tar.gz 240617 BLAKE2B 06b040fa83327a38ea23e4b09c4ae978b5953ac99a7fec4b7fabb8982e8bb8da3e2f4781654159aec9989b4c99a119e1116622fa75bd4cac63d6a5c8b34bbf31 SHA512 2a224d9bf8e41059a1316d80738cdc0f1e4c4e0f987baf3969710bae7192466b708c7942cd7e4eeccea55582ce70bb687c96b9e7dece3229ae4cffc558aa2319
-DIST astroid-1.6.0.tar.gz 255715 BLAKE2B 60fa855779428fb984eb450afd1e6869a98f82fb06786194993a5f4c878f25417cb91ef2c2cdc12da62cbfa68e2742f8ac29cbc7b7ef295ed60201c72b562668 SHA512 6a384b2bd3b4ee686c2f9a69d10f4391e5950869d75808312b2715a620ba7caa706bd88a5e021ea2250cf16ff8013cf0b332faee0b07dd7b5e1baf11e65d0ac3
 DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014ae52e4e4b8f8209a000c55bbdbb1ddcd3fb90d078f99a34d4a4779adabc8ad71af40c3a4547fe3e0d814b328c SHA512 f51f275c9f04809c8993d187cb62fadc84003ddc954d371356474dbe6b719868406fd9188c560f5b658b8b44bb6a4d3ee0785e809e789ca117e2bcbdb58aec53
+DIST astroid-2.1.0.tar.gz 276196 BLAKE2B f09ef4629bb29d0492f1f6ddafd1c0f4d4ef09df5612f3a9a811b09dec7a8c6294a44458e79223232f467a70434022cc23b4745515199beaf4727bd0591bccb3 SHA512 ca200d51613782a85c3f164e9ef55bac1de288c45e7662645ef080cc84a88e34499b2a924b130e9215418842c25352bb948c02d569ac45c251ac37bc57f0dcd8
 EBUILD astroid-1.4.8.ebuild 1093 BLAKE2B 89692333f08a4c9b3b46086a20ef4e6cc186cfef6e9530b1ccd0eb6515fa74117fce8fbd1c55710323957a3f2eec57310b752e791d59a06a06926b8909d46140 SHA512 8e076be66daad2fae26351d89f3c61c6d41523ad7240c78a0e3c184fc1db634c708ca7348137d0eff11bfa20959084d7a97b0a9791caaf164c877984ebb90473
-EBUILD astroid-1.5.3.ebuild 1659 BLAKE2B 332bbb2ed4ae5a2f07e370f8f85c556cdf2a6cf486f6c261c7f18bda7f960d3de097e107b322344bc735f1eb4083461491b96cc7c36bc815aa2ed99ccb3ec0b7 SHA512 2076a3fefdc95b2f7362d5518fff0d749efba199409e51285131ea583d03135eea22a5c24907dba5b33940a80c58a8b2b04d79a69f950576fb08b9d227f1a80a
-EBUILD astroid-1.6.0.ebuild 1939 BLAKE2B c32202f279336b9d2ddebaba31f5469cc71bda427280c13950d554deafa2048f417cd4fe5eadb9a0885d62b5c53f6ce3ba8f26e14b067932ddf0cbf4d57adafe SHA512 b4e397cd08c2a326b47c3d18801975be3fe8b36de17ffe864c20eedfd1c986e0637295bbcbcb73b027be137ed690143b89ca353f347532487841d187ed427dcf
 EBUILD astroid-1.6.5.ebuild 2018 BLAKE2B 3a1bf455d17fc76abbce1b6739d4c81bc1a06fdc1d36e3b06187175cdf3825442221089a48f81b434a9daff92b4d727e3e885555ce1eb2e2dcc92263ce573da1 SHA512 61cd00a454cf0c0c092a0cac9db03bdb87eae1da854991ee4524ec749b143e05c432c83312aff0e1e9be4ef6c678a3a60b4e81769dbb267783de3af7db96d964
+EBUILD astroid-2.1.0.ebuild 1353 BLAKE2B 2c951fcf5242716f084864882e8ef2786507f5987b0203c183d10c301733b34af0c3761e18e3b45a29ec7bed444d638f0ffc615f1f4b2cc4cdcb3b03900d3f97 SHA512 7fe46d0233bee3e4d50e260e370f9664d7bf52d2740f637333067d854444c9c7792297fc927994c2cb85ca8340c218967dd0ce4f0112c8b428b666a53bb04ef7
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-1.5.3.ebuild b/dev-python/astroid/astroid-1.5.3.ebuild
deleted file mode 100644
index b250c9a812d4..000000000000
--- a/dev-python/astroid/astroid-1.5.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*')
-		>=dev-python/pylint-1.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Disable failing tests
-	# TODO: investigate if it's our fault and how can we fix it
-	sed -i -e "s/test_namespace_package_pth_support/_&/" \
-		astroid/tests/unittest_manager.py || die
-	# we hack xml module, so it does not match what they expect...
-	sed -i -e "s/test_module_model/_&/" \
-		astroid/tests/unittest_object_model.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
-}
diff --git a/dev-python/astroid/astroid-1.6.0.ebuild b/dev-python/astroid/astroid-1.6.0.ebuild
deleted file mode 100644
index 8d1dd59ff80b..000000000000
--- a/dev-python/astroid/astroid-1.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*')
-		>=dev-python/pylint-1.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Disable failing tests
-	# TODO: investigate if it's our fault and how can we fix it
-	sed -i -e "s/test_namespace_package_pth_support/_&/" \
-		astroid/tests/unittest_manager.py || die
-	# we hack xml module, so it does not match what they expect...
-	sed -i -e "s/test_module_model/_&/" \
-		astroid/tests/unittest_object_model.py || die
-
-	# no idea why this test fails
-	sed -i -e "s/test_namespace_and_file_mismatch/_&/" \
-		astroid/tests/unittest_manager.py || die
-
-	# and this test works yet it shouldn't
-	sed -i -e "s#test_object_dunder_new_is_inferred_if_decorator#_&#" \
-		astroid/tests/unittest_inference.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
-}
diff --git a/dev-python/astroid/astroid-2.1.0.ebuild b/dev-python/astroid/astroid-2.1.0.ebuild
new file mode 100644
index 000000000000..37e1ff128e5d
--- /dev/null
+++ b/dev-python/astroid/astroid-2.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<=dev-python/typed-ast-1.2.0[${PYTHON_USEDEP}]' python3_5 python3_6)"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.1.0-no-pytest-runner.patch"
+)
+
+python_prepare_all() {
+	# Disable failing tests
+
+	# no idea why this test fails
+	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
+		astroid/tests/unittest_modutils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} -m pytest -v --pyarg astroid/tests || die "tests failed"
+}
diff --git a/dev-python/astroid/files/astroid-2.1.0-fix-tests.patch b/dev-python/astroid/files/astroid-2.1.0-fix-tests.patch
new file mode 100644
index 000000000000..32e75225507b
--- /dev/null
+++ b/dev-python/astroid/files/astroid-2.1.0-fix-tests.patch
@@ -0,0 +1,16 @@
+typed_ast doesn't support py37 yet and disables its support under py37.
+However, when dev-python/types-ast is installed, the test suite mistakenly
+thinks that it has to test typed_ast-related things and fails.
+diff --git a/astroid/tests/unittest_nodes.py b/astroid/tests/unittest_nodes.py
+index 56b195c2..762f1af2 100644
+--- a/astroid/tests/unittest_nodes.py
++++ b/astroid/tests/unittest_nodes.py
+@@ -49,6 +49,8 @@ try:
+ except ImportError:
+     HAS_TYPED_AST = False
+ 
++if sys.version_info[:2] >= (3, 7):
++    HAS_TYPED_AST = False
+ 
+ class AsStringTest(resources.SysPathSetup, unittest.TestCase):
+     def test_tuple_as_string(self):
diff --git a/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch b/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch
new file mode 100644
index 000000000000..94eda1725457
--- /dev/null
+++ b/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 2ad90aac..4628a40f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -42,7 +42,6 @@ def install():
+                  install_requires = install_requires,
+                  extras_require=extras_require,
+                  packages=find_packages(exclude=['astroid.tests']) + ['astroid.brain'],
+-                 setup_requires=['pytest-runner'],
+                  test_suite='test',
+                  tests_require=['pytest'],
+                  )