gentoo Easter resync : 12.04.2020

4 files changed, 49 insertions, 31 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 6785d1d2171c..85c0fbe34ce2 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,6 @@
-AUX spyder-4.0.1-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
-AUX spyder-4.0.1-py3-only.patch 2182 BLAKE2B b14e63a4bbde01aff8f629ec7fea5ca61790ba1ceecd858700f705baddb94c77083377fc980c4f5e95c315d2b1c7bdf6f700829848b36fd90ca0d69e17b33c36 SHA512 9abdd6e8f02ecb32fd7def4f6825920d4e5650a22d78cc98171af805d0cd5510a328632f43b44c234fcb4f35cb4efa538b5c716e2cf1029ead585b40e16b9903
-DIST spyder-4.0.1.tar.gz 10783565 BLAKE2B 5d264991b9bfc8118ef91f929269a300932cb0078b70c54613836c4337dc41214aa4ab81dacb4a535aaa6dea6b1eb591e25c7071664dc102e218373a0d7f8824 SHA512 9249a3b4a73ebe7a485d75fe2bea68bfa106c8ad0710120a6e05a43e3e2a65f9076904d1104180e925ab282b1d9da712c3509e0a5a7cfe3bd5ea8a95a1617bdd
+AUX spyder-4.1.1-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
+AUX spyder-4.1.1-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
+DIST spyder-4.1.1.tar.gz 11135335 BLAKE2B fc253ea266b368f372f2f0de30120d58c0e5c6e4cf474ccec0884c5fd3557cbd929eb17c0b9f2ee04745861499e12f54e61566507d844c9cf804bef65b3438d4 SHA512 e778dbac4c3f3462c32c9117ce6f6a8e5f2c8df5317695d76bf7a61995cac7be2e224cb751eda337b32442c9a32a7d53f8779a9288f15ad8d1a7aac9d328237c
 DIST spyder-docs-7c0b590.tar.gz 2257637 BLAKE2B 7e9528fde453631227ece3bd8c9163a0b3daadf3a83160b5475f943c49e7a559ff33dfe03531240b99571c535887ecff8459116d566dd7c739c74c4165e00060 SHA512 4d9548cc69db85ae6e93cac64e680460da6f9e76bf8b1265b31fbd4925786d29427de40bf06fd52ba807b0bb8f6c224e35b809c0e015a77013deb383e6d666f8
-EBUILD spyder-4.0.1-r1.ebuild 5912 BLAKE2B 2eb84c632488e71d4f34e4cc8f8e17d49cab93c36db86641b9c2b9961fc3932e8f5b8b9344c0ba7f22637da47d938a0df41d0dae4e82918846d88c3e854f3448 SHA512 502fed93839653e2036ae93b6477d1a88cc919f2433400da8ef5a43363a40a594066b9b4f4882d3d72346683746b1f9a109239a208b14f24baa870721d61f302
+EBUILD spyder-4.1.1-r2.ebuild 6640 BLAKE2B 04d660c26824cd29ae71a36d0222ced95fe893a3cbc3fc9ccc00b1be7f892f9c38232dc3d67e194ef1ed49d8e9f813e912b616a2df23cf652979103872de8a7b SHA512 2da67ff185108334c662769bc3d6afb2e7e57c951f7c77a5729aa946e6ad5d3233db181fde187a2d2675c063b7c1e8c92203f05681b7d9e0c478c6bd0634f8cf
 MISC metadata.xml 1526 BLAKE2B 2a2231f8512f9681558b1e53ac7a9bec850a210a82cb9771baca1088763b22cdcecdc0b0f2f5f9d93241cdee3ccbe3a71a7dc92a1772b53c1e8c499be432893d SHA512 3ff5cc8b66cb53ea1fb30076ca1e0c83b71f844f99d46f7bc7e6f95d3bbe33d44d3b0564be1ac85e76449bf20b6b3672a8757c6774445472ed386253e91cb9b7
diff --git a/dev-python/spyder/files/spyder-4.0.1-build.patch b/dev-python/spyder/files/spyder-4.1.1-build.patch
index 7463550fc165..7463550fc165 100644
--- a/dev-python/spyder/files/spyder-4.0.1-build.patch
+++ b/dev-python/spyder/files/spyder-4.1.1-build.patch
diff --git a/dev-python/spyder/files/spyder-4.0.1-py3-only.patch b/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
index df5f0c4ad1c6..afdc92a1e122 100644
--- a/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
+++ b/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
@@ -1,5 +1,5 @@
 diff --git a/setup.py b/setup.py
-index a492549..b77f758 100644
+index 2d5d58b..4adc952 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -31,13 +31,6 @@ import shutil
@@ -28,23 +28,22 @@ index a492549..b77f758 100644
 -            data_files = [('share/applications', ['scripts/spyder.desktop']),
 -                          ('share/icons', ['img_src/spyder.png'])]
 +        data_files = [('share/applications', ['scripts/spyder.desktop']),
-+                      ('share/pixmaps', ['img_src/spyder.png'])]
++                      ('share/icons', ['img_src/spyder.png'])]
      elif os.name == 'nt':
          data_files = [('scripts', ['img_src/spyder.ico',
                                     'img_src/spyder_reset.ico'])]
-@@ -115,10 +103,7 @@ def get_packages():
- # platforms due to a bug in pip installation process
+@@ -131,9 +119,7 @@ CMDCLASS = {'install_data': MyInstallData}
  # See spyder-ide/spyder#1158.
  SCRIPTS = ['%s_win_post_install.py' % NAME]
+ 
 -if PY3 and sys.platform.startswith('linux'):
 -    SCRIPTS.append('spyder3')
 -else:
--    SCRIPTS.append('spyder')
-+SCRIPTS.append('spyder')
- 
++if sys.platform.startswith('linux'):
+     SCRIPTS.append('spyder')
  
- #==============================================================================
-@@ -246,8 +231,7 @@ if 'setuptools' in sys.modules:
+ if os.name == 'nt':
+@@ -269,8 +255,7 @@ if 'setuptools' in sys.modules:
  
      setup_args['entry_points'] = {
          'gui_scripts': [
diff --git a/dev-python/spyder/spyder-4.0.1-r1.ebuild b/dev-python/spyder/spyder-4.1.1-r2.ebuild
index 43bba250f2c4..7d3574a82574 100644
--- a/dev-python/spyder/spyder-4.0.1-r1.ebuild
+++ b/dev-python/spyder/spyder-4.1.1-r2.ebuild
@@ -28,26 +28,28 @@ RDEPEND="
 	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
 	dev-python/intervaltree[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.14.1[${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-0.3[${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.2[${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.7[${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.8.1[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-2.0.0[${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? (
@@ -62,13 +64,16 @@ DEPEND="test? (
 	dev-python/pytest-mock[${PYTHON_USEDEP}]
 	dev-python/pytest-qt[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/sympy[${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" )
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-py3-only.patch"
+)
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/doc --no-autodoc
@@ -77,6 +82,11 @@ python_prepare_all() {
 	# move docs into workdir
 	mv ../spyder-docs-${DOCS_PV}* docs || die
 
+	# allow newer parso: https://bugs.gentoo.org/715148
+	sed -i -e 's/parso =0.5.2/parso >=0.5.2/g' requirements/conda.txt || die
+	sed -i -e 's/parso==0.5.2/parso>=0.5.2/g' setup.py || die
+	sed -i -e 's/=0.5.2/>=0.5.2/g' spyder/dependencies.py || 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
@@ -85,25 +95,34 @@ python_prepare_all() {
 	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 uri (online) tests
-	rm spyder/plugins/editor/widgets/tests/test_goto.py || die
-
 	# skip online test
 	rm spyder/widgets/github/tests/test_github_backend.py || die
 
-	# Assertion error, looks like an online test
-	rm spyder/utils/tests/test_vcs.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
+
+	# Fatal Python error: Segmentation fault
+	sed -i -e 's:test_copy_path:_&:' \
+		spyder/plugins/explorer/widgets/tests/test_explorer.py || die
 
-		# No idea why this fails, no error just stops and dumps core
+	# 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
-	sed -i -e 's:test_connection_dialog_remembers_input_with_password:_&:' \
-		-e 's:test_connection_dialog_remembers_input_with_ssh_passphrase:_&:' \
-			spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+	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:_&:' \