gentoo resync : 25.08.2020

4 files changed, 12 insertions, 177 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index c998d2db008e..78e22894da78 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,9 +1,6 @@
 AUX spyder-4.1.2-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
 AUX spyder-4.1.2-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
-DIST spyder-4.1.2.tar.gz 11125567 BLAKE2B 38591301fa9d97836341c9e86134fee1515ce901f42aeb45f606f23f5da7411e45e98e872dda0f0de4504e062eb6aa188d3db15181074220e69624a6b28dd8f6 SHA512 a0aeb1f7eb66f2efd5bb7da6ed7401668ca76e968b9b651882567664925be22ba0748914477876e2c62761442c57fa69c19a9fc6556251ac6db83bcd6088d000
-DIST spyder-4.1.3.tar.gz 11610111 BLAKE2B 5cc25a6a8c6609dcec8e5e0d4beddfa582b2f632a4d1c61ef68e68e82f3cbc2b29694ddc7cdda216e4a8143254e6c1cca1e817a3f72be324671ff0196f3f0842 SHA512 0d0568c500c5b153bcd0073897eaf4e526e62bbc82c4a795683185cdac86f00c24d3b2efaa1f6bcd2f60305e387cda46bb732fbeaf21391e9d80ca4b18787b7e
-DIST spyder-docs-1022fd8.tar.gz 3539049 BLAKE2B 6d54a990ab681e9ed8a5f1a03e59e86c29eb94af18f29dd6c3b8b782230974cf057d25993b0e0358d0f32aba3fd8740dc94fb173766c094e7954d9f39456e6a5 SHA512 84935fb0665e1981c319484ba97096bf6996cc618d073417d06f3dfb703366429be333203af3ff2fe124cf00cc72e416fbc97734be4e21e9200b104fea167933
-DIST spyder-docs-6abac0ce8be017c6ecfb2b451700bf5b0e4c36dd.tar.gz 15821929 BLAKE2B 843510c87dc9ca616a6114159445894d2f4728201a93f424131f2524c8bc833d1b1540740d1e7cf473c4aed501cce775a073a9ee8748fe29b4193c927da70820 SHA512 c9161a7dc4bdef8e9a1ebe84ee7cc01fb9083965b54fc421d006a999ff753485c3d4a615e9646a6be47826663a64dc9af7f442dc2e4c81283c6eb5de55a8a3a9
-EBUILD spyder-4.1.2.ebuild 6243 BLAKE2B d12fa7cc66a245731f2b30c07017aa8f58671877a5f8abf6d9b3d9c95ab7cb3859ad9cfdb20cf0d38a368b8398f0d8f774b63339c8780f242cb705d47e1fe1f1 SHA512 3f4a3045836607850215a9010603c91945f2fae33a2ea068ca8843bcab883f141a7f1258525abc49e945cc30f6a869cafe9ba634636f04f839a95efba3692b3b
-EBUILD spyder-4.1.3.ebuild 6278 BLAKE2B 23e63cbe40558640b4dee615d8f7149ce031295fa8217dc3011ad352e47198f008ce7c9af0ea9584528aa79fcad2a1c04765a165d74625c9bfd1b7bd8bd80f66 SHA512 02b75ab6a973f80f079e5a0dff490605624eab3cb30d56a537a2c172861560dda569c1f17a5879d2e05a0e608bf181d51e76b3ff9f78bd84e8e7388eef4553b8
-MISC metadata.xml 1526 BLAKE2B 2a2231f8512f9681558b1e53ac7a9bec850a210a82cb9771baca1088763b22cdcecdc0b0f2f5f9d93241cdee3ccbe3a71a7dc92a1772b53c1e8c499be432893d SHA512 3ff5cc8b66cb53ea1fb30076ca1e0c83b71f844f99d46f7bc7e6f95d3bbe33d44d3b0564be1ac85e76449bf20b6b3672a8757c6774445472ed386253e91cb9b7
+DIST spyder-4.1.4.tar.gz 11699453 BLAKE2B 208ba4f32fa548ef8478d72c046e70ba43a2fccd2040629af03f7f56c379ebefa1e90594054f15a92aebdd14307d001c68ee5e6d2401a841e408c4af42436c33 SHA512 8a5f63b11648002838e0b4e5427b1c7cf9cbe4a4fd20af7e33e5e789cddaf6393bb7200bfacf8c7af19d723f12d99d2e962a769706b806335f7146ddd6853735
+DIST spyder-docs-0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e.tar.gz 29749238 BLAKE2B 9cf655c2a6fdf84278eaeb2e6f13c92eb4e585f213fd4f164a2707bc3cf8cb8abaaa213c5e781414fb0eecb3cf26b1f1708b394cd1ca12fa353ccbdd33f01dcb SHA512 8ed005cbfc32d7c68cf633790446d5d271f4d38ad190c09b2bcfd3ee96f24af5443d911bcdea90dc6ad94c5dab78437b9db02d0d4a7ceb9afa37a31e4bad24ae
+EBUILD spyder-4.1.4.ebuild 6065 BLAKE2B 60946f019296720480b43224beec7608b65a96b06bac0f7291443c18c38b31535831b18452f2d8724186d20f9430e1b4a3910aa4accae0e5913d9818af3d95ab SHA512 f773bccebff54a16d00f74eaf97a11e44a5b49bd8c327a0c83ce34c94eb61cd763e6025fe6fe327c4318062612b018ab9422128dcc7a1cd9396c7441cedfddce
+MISC metadata.xml 1413 BLAKE2B cf9779b0f4f71f9929c9faefc8e50c1f0a06a55927002f1473958934a9eb808651c0df8171ef8faf16f7ce2bb3149ff119a8e9df1896e18121c545d6244ae13c SHA512 bbb55ced9bcc673df13224acb530de91094a496e97af91229ce5dc8ab167414f1a606994596779e0b6d99845c157b699783c63af761c4e9428ba35a658ef9cdf
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index 46303e6157dd..47504714a176 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/spyder/spyder-4.1.2.ebuild b/dev-python/spyder/spyder-4.1.2.ebuild
deleted file mode 100644
index 2123862db62d..000000000000
--- a/dev-python/spyder/spyder-4.1.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit eutils xdg distutils-r1 virtualx
-
-# Commit of documentation to fetch
-DOCS_PV="1022fd8"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	dev-python/intervaltree[${PYTHON_USEDEP}]
-	>=dev-python/ipython-4.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.15.2[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/parso-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-0.25[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.31.9[${PYTHON_USEDEP}]
-	<dev-python/python-language-server-0.32.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.9.0[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xarray[${PYTHON_USEDEP}] )"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-py3-only.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc --no-autodoc
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# some tests still depend on QtPy[webkit] which is going to be removed
-	# spyder itself works fine without webkit
-	rm spyder/widgets/tests/test_browser.py || die
-	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
-	rm spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-	rm spyder/plugins/ipythonconsole/tests/test_ipython_config_dialog.py || die
-	rm spyder/plugins/help/tests/test_widgets.py || die
-	rm spyder/plugins/help/tests/test_plugin.py  || die
-	# fails to collect
-	rm spyder/app/tests/test_mainwindow.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	# AssertionError: assert 'import numpy' == '# import numpy'
-	sed -i -e 's:test_comment:_&:' \
-		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
-
-	# AssertionError: assert '' == 'This is some test text!'
-	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
-		spyder/plugins/editor/widgets/tests/test_editor.py || die
-
-	# RuntimeError: Unsafe load() call disabled by Gentoo. See bug #659348
-	sed -i -e 's:test_dependencies_for_binder_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# No idea why this fails, no error just stops and dumps core
-	sed -i -e 's:test_arrayeditor_edit_complex_array:_&:' \
-		spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py || die
-
-	# Assertion error, can't connect/remember inside ebuild environment
-	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
-
-	# Assertion error (pytest-qt), maybe we can't do shortcuts inside ebuild environment?
-	sed -i -e 's:test_transform_to_uppercase_shortcut:_&:' \
-		-e 's:test_transform_to_lowercase_shortcut:_&:' \
-		-e 's:test_go_to_line_shortcut:_&:' \
-		-e 's:test_delete_line_shortcut:_&:' \
-			spyder/plugins/editor/widgets/tests/test_shortcuts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx pytest -vv
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 and spyder-vim do not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		# optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-}
diff --git a/dev-python/spyder/spyder-4.1.3.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild
index 40dfff6e2109..184855914157 100644
--- a/dev-python/spyder/spyder-4.1.3.ebuild
+++ b/dev-python/spyder/spyder-4.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_7 )
 inherit eutils xdg distutils-r1 virtualx
 
 # Commit of documentation to fetch
-DOCS_PV="6abac0ce8be017c6ecfb2b451700bf5b0e4c36dd"
+DOCS_PV="0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -32,18 +32,18 @@ RDEPEND="
 	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
 	dev-python/intervaltree[${PYTHON_USEDEP}]
 	>=dev-python/ipython-4.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.15.2[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.17.1[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
 	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/parso-0.5.2[${PYTHON_USEDEP}]
+	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-0.25[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.31.9[${PYTHON_USEDEP}]
-	<dev-python/python-language-server-0.32.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.34.0[${PYTHON_USEDEP}]
+	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
 	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
@@ -51,7 +51,7 @@ RDEPEND="
 	>=dev-python/qtconsole-4.6.0[${PYTHON_USEDEP}]
 	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.9.1[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.9.2[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
 	dev-python/watchdog[${PYTHON_USEDEP}]
 "
@@ -90,7 +90,7 @@ python_prepare_all() {
 	# these deps are packaged separately
 	rm external-deps/* -r || die
 
-	# some tests still depend on QtPy[webkit] which is going to be removed
+	# some tests still depend on QtPy[webkit] which is removed
 	# spyder itself works fine without webkit
 	rm spyder/widgets/tests/test_browser.py || die
 	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
@@ -115,10 +115,6 @@ python_prepare_all() {
 	# Assertion error, can't connect/remember inside ebuild environment
 	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
 
-	# assert 77 in [71, 78] assert 45 in [43, 46]
-	sed -i -e 's:test_objectexplorer_collection_types:_&:' \
-		spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.py || die
-
 	# Assertion error (pytest-qt), maybe we can't do shortcuts inside ebuild environment?
 	sed -i -e 's:test_transform_to_uppercase_shortcut:_&:' \
 		-e 's:test_transform_to_lowercase_shortcut:_&:' \