[gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/

[Matt Turner]

commit:     eb47d00796ea8cc9fa47e1fa79ef6dfea11ce44c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu May 14 12:31:20 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 26 20:41:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb47d007

dev-python/spyder: version bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-python/spyder/Manifest                         |  2 ++
 dev-python/spyder/spyder-4.1.2.ebuild              |  2 +-
 .../{spyder-4.1.2.ebuild => spyder-4.1.3.ebuild}   | 38 ++++++++++++----------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index a4f09dcf716..90d416e11ca 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,2 +1,4 @@
 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

diff --git a/dev-python/spyder/spyder-4.1.2.ebuild b/dev-python/spyder/spyder-4.1.2.ebuild
index a16c87621eb..2123862db62 100644
--- a/dev-python/spyder/spyder-4.1.2.ebuild
+++ b/dev-python/spyder/spyder-4.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit eutils xdg distutils-r1 virtualx
 

diff --git a/dev-python/spyder/spyder-4.1.2.ebuild b/dev-python/spyder/spyder-4.1.3.ebuild
similarity index 88%
copy from dev-python/spyder/spyder-4.1.2.ebuild
copy to dev-python/spyder/spyder-4.1.3.ebuild
index a16c87621eb..40dfff6e210 100644
--- a/dev-python/spyder/spyder-4.1.2.ebuild
+++ b/dev-python/spyder/spyder-4.1.3.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit eutils xdg distutils-r1 virtualx
 
 # Commit of documentation to fetch
-DOCS_PV="1022fd8"
+DOCS_PV="6abac0ce8be017c6ecfb2b451700bf5b0e4c36dd"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -22,6 +22,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# Tests succeed, but freezes at the end, installation does not continue
+RESTRICT="test"
+
 RDEPEND="
 	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
@@ -48,9 +51,10 @@ 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.0[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.9.1[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]"
+	dev-python/watchdog[${PYTHON_USEDEP}]
+"
 
 DEPEND="test? (
 	dev-python/coverage[${PYTHON_USEDEP}]
@@ -65,14 +69,15 @@ DEPEND="test? (
 	dev-python/pytest-qt[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xarray[${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"
+	"${FILESDIR}/${PN}-4.1.2-build.patch"
+	"${FILESDIR}/${PN}-4.1.2-py3-only.patch"
 )
 
 distutils_enable_tests pytest
@@ -82,6 +87,9 @@ python_prepare_all() {
 	# move docs into workdir
 	mv ../spyder-docs-${DOCS_PV}* docs || die
 
+	# these deps are packaged separately
+	rm external-deps/* -r || 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
@@ -96,10 +104,6 @@ python_prepare_all() {
 	# 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
@@ -108,13 +112,13 @@ python_prepare_all() {
 	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
 
+	# 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:_&:' \
@@ -142,10 +146,10 @@ pkg_postinst() {
 		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)
+		# spyder-autopep8 does 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 "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