gentoo resync : 25.11.2020

2 files changed, 50 insertions, 38 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index b28ec64e9c2b..d6497d03f0f1 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,7 +1,7 @@
 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
 AUX spyder-4.1.5-doc-theme-renamed.patch 375 BLAKE2B f4c902b331e9e6f034018d781d483380e85b3277f5e8f3f64f15ebcd4673ee1a805838a10c5606aa853c1c0779c10a439bb556dd57a7427bf96aa2fce0c7b9a9 SHA512 7671f0639c8947a0cbd4ac24c0a9731cb31a7c8f2ca49ac7a9d2dc8f4b7b08aa033448c285ba71f844fc8588167bf91b44c3cadaf3fd83883160c2eddc5b7e7b
-DIST spyder-4.1.5.tar.gz 11705605 BLAKE2B da22046116ea67c1d4f02ddf44d846fcf4361c45bae57a0b328ae646a1bcdc35494d42cb909c8b4d51cf0ae7c6578c4b4a3c746e55a5055a98dcb6a2b7c3cabb SHA512 9b118d857806791ed83182019088ad5b877fffe5e26cd47b4638cd9bdc68fc6ad8339186046a30715b5ccc6c503bc0a2824b7260f325816c9f750b9af667e3f1
+DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
-EBUILD spyder-4.1.5.ebuild 8093 BLAKE2B ff19adb85e6c0b757a26cd0f8f0ad4142b3a64a8850dfd6851ea5389b2299cf2c9e99b0565bde5c907b17f060096796ac89858da701c6ebe30c936522e37aa7e SHA512 e8e08b61b975a7f523efd0413d79a3adcadba42182552373c5d6425f4671f9877738f54a929575777c30fd37def827ecadc12b430164a79db4cf211e7bf17b54
+EBUILD spyder-4.2.0.ebuild 8406 BLAKE2B e634bfeccb37da403424636e1c1425ab375bbadcf34da1c9ef3b3a250fc8675a0b213259176025b7565d899bb56af260dfb2e761c07b5ba16112b1b3783afd35 SHA512 c190334f7bf444d8872207de4021422395ebb5accbb4273d17b88c29811fc45c71bd72f1a3a069659825ae3dda645b8f179bfbc7c9613020733ead734619dafe
 MISC metadata.xml 1413 BLAKE2B cf9779b0f4f71f9929c9faefc8e50c1f0a06a55927002f1473958934a9eb808651c0df8171ef8faf16f7ce2bb3149ff119a8e9df1896e18121c545d6244ae13c SHA512 bbb55ced9bcc673df13224acb530de91094a496e97af91229ce5dc8ab167414f1a606994596779e0b6d99845c157b699783c63af761c4e9428ba35a658ef9cdf
diff --git a/dev-python/spyder/spyder-4.1.5.ebuild b/dev-python/spyder/spyder-4.2.0.ebuild
index 8e298c03b636..7a013fecdd6a 100644
--- a/dev-python/spyder/spyder-4.1.5.ebuild
+++ b/dev-python/spyder/spyder-4.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit eutils xdg distutils-r1
+inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
 DOCS_PV="7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c"
@@ -24,7 +24,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# Extra indented deps are expansion of python-language-server[all] dep
+# White space separated deps are expansion of python-language-server[all] dep
 # As the pyls ebuild does not add flags for optional runtime dependencies
 # we have to manually specify these desp instead of just depending on the [all]
 # flag. The indentation allows us to distinguish them from spyders direct deps.
@@ -32,12 +32,12 @@ 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-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	dev-python/intervaltree[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/ipython-4.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.17.1[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
 	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
 	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
@@ -46,7 +46,7 @@ RDEPEND="
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.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-0.36.1[${PYTHON_USEDEP}]
 
 	dev-python/autopep8[${PYTHON_USEDEP}]
 	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
@@ -62,16 +62,19 @@ RDEPEND="
 	dev-python/yapf[${PYTHON_USEDEP}]
 
 	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.1.1[${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/qtconsole-4.7.7[${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.4[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
 "
 
 BDEPEND="test? (
@@ -99,7 +102,6 @@ BDEPEND="test? (
 # This fails because access is denied to this command during build
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.2-build.patch"
-	"${FILESDIR}/${PN}-4.1.2-py3-only.patch"
 	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
 )
 
@@ -112,7 +114,6 @@ DOCS=(
 	"NOTICE.txt"
 	"README.md"
 	"RELEASE.md"
-	"TROUBLESHOOTING.md"
 )
 
 S="${WORKDIR}/${PN}-${MYPV}"
@@ -126,6 +127,8 @@ python_prepare_all() {
 
 	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
 	rm external-deps/* -r || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
 
 	# do not depend on pyqt5<13
 	sed -i -e '/pyqt5/d' \
@@ -136,41 +139,50 @@ python_prepare_all() {
 	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
 		spyder/tests/test_dependencies_in_sync.py || die
 
-	# 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
-	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
-	rm spyder/app/tests/test_mainwindow.py || die
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
 
 	# skip online test
 	rm spyder/widgets/github/tests/test_github_backend.py || die
 
+	# KeyError: 'conda: base', need conda??
+	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
+		spyder/widgets/tests/test_status.py || die
+
+	# assert 2 == 1
+	sed -i -e 's:test_pylint_max_history_conf:_&:' \
+		spyder/plugins/pylint/tests/test_pylint.py || die
+
+	# https://bugs.gentoo.org/747211
+	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
+		spyder/plugins/projects/tests/test_plugin.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
-
-	# Fatal Python error: Segmentation fault
-	# sometimes it works, sometimes it segfaults
-	sed -i -e 's:test_copy_path:_&:' \
-		-e 's:test_copy_file:_&:' \
-		-e 's:test_save_file:_&:' \
-		-e 's:test_delete_file:_&:' \
-		spyder/plugins/explorer/widgets/tests/test_explorer.py || die
+	# hangs till forever
+	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
+		spyder/app/tests/test_mainwindow.py || die
 
 	# Assertion error, can't connect/remember inside ebuild environment
 	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
 
-	# AssertionError: assert 47 in [43, 44, 45, 46]
-	sed -i -e 's:test_objectexplorer_collection_types:_&:' \
-		spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.py  || die
+	# AssertionError: waitUntil timed out in 20000 miliseconds
+	sed -i -e 's:test_pdb_multiline:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+
+	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
+	sed -i -e 's:test_undo_return:_&:' \
+		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
+
+	# assert False is True
+	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
+		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
+
+	# AssertionError: waitUntil timed out in 10000 miliseconds
+	sed -i -e 's:test_get_hints:_&:' \
+		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
 
 	distutils-r1_python_prepare_all
 }