gentoo resync : 16.09.2020

4 files changed, 226 insertions, 2 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 78e22894da78..2faa012e610e 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,10 @@
 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.4.tar.gz 11699453 BLAKE2B 208ba4f32fa548ef8478d72c046e70ba43a2fccd2040629af03f7f56c379ebefa1e90594054f15a92aebdd14307d001c68ee5e6d2401a841e408c4af42436c33 SHA512 8a5f63b11648002838e0b4e5427b1c7cf9cbe4a4fd20af7e33e5e789cddaf6393bb7200bfacf8c7af19d723f12d99d2e962a769706b806335f7146ddd6853735
+DIST spyder-4.1.5.tar.gz 11705605 BLAKE2B da22046116ea67c1d4f02ddf44d846fcf4361c45bae57a0b328ae646a1bcdc35494d42cb909c8b4d51cf0ae7c6578c4b4a3c746e55a5055a98dcb6a2b7c3cabb SHA512 9b118d857806791ed83182019088ad5b877fffe5e26cd47b4638cd9bdc68fc6ad8339186046a30715b5ccc6c503bc0a2824b7260f325816c9f750b9af667e3f1
 DIST spyder-docs-0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e.tar.gz 29749238 BLAKE2B 9cf655c2a6fdf84278eaeb2e6f13c92eb4e585f213fd4f164a2707bc3cf8cb8abaaa213c5e781414fb0eecb3cf26b1f1708b394cd1ca12fa353ccbdd33f01dcb SHA512 8ed005cbfc32d7c68cf633790446d5d271f4d38ad190c09b2bcfd3ee96f24af5443d911bcdea90dc6ad94c5dab78437b9db02d0d4a7ceb9afa37a31e4bad24ae
-EBUILD spyder-4.1.4.ebuild 6065 BLAKE2B 60946f019296720480b43224beec7608b65a96b06bac0f7291443c18c38b31535831b18452f2d8724186d20f9430e1b4a3910aa4accae0e5913d9818af3d95ab SHA512 f773bccebff54a16d00f74eaf97a11e44a5b49bd8c327a0c83ce34c94eb61cd763e6025fe6fe327c4318062612b018ab9422128dcc7a1cd9396c7441cedfddce
+DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
+EBUILD spyder-4.1.4.ebuild 6069 BLAKE2B cb688d82c8fc52ffc4c065c65fc8a74847a88d7f09126bebb6f6abd527e425c44faa35cbcf2f9ff2cabbd515431d23b6c03d36fccb719191ee1f596d91eb0fe2 SHA512 118a9696b218f98376058371296304401631e6df1677e99e5541e98882d6a1c2a138f90b6dde39af5ee2a8b0e1a787415518802f4a8eda437f3287e7eecf84bd
+EBUILD spyder-4.1.5.ebuild 8089 BLAKE2B fda390a471de6d4363ec9418b8f7af7400c4f375f71dd260f687abfeed32b2406de9263692f15d7d524fd84986b77b1d2fbbd37d753e0e87fd28967df13bfc55 SHA512 17f7774c0340292d3d405bf7e6ae1c4048b5a1dcdbed3ecee0d7cfb50c4406d3b52c86391b21222347374c381dc739c50a45862bf730496f9503933f2929585f
 MISC metadata.xml 1413 BLAKE2B cf9779b0f4f71f9929c9faefc8e50c1f0a06a55927002f1473958934a9eb808651c0df8171ef8faf16f7ce2bb3149ff119a8e9df1896e18121c545d6244ae13c SHA512 bbb55ced9bcc673df13224acb530de91094a496e97af91229ce5dc8ab167414f1a606994596779e0b6d99845c157b699783c63af761c4e9428ba35a658ef9cdf
diff --git a/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch
new file mode 100644
index 000000000000..8a93662950f0
--- /dev/null
+++ b/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch
@@ -0,0 +1,13 @@
+diff --git a/docs/doc/conf.py b/docs/doc/conf.py
+index fd6d5ec..3de0bad 100644
+--- a/docs/doc/conf.py
++++ b/docs/doc/conf.py
+@@ -129,7 +129,7 @@ pygments_style = "sphinx"
+ #
+ # CI = True
+ # TRAVIS_BRANCH = 'master'
+-html_theme = "pandas_sphinx_theme"
++html_theme = "pydata_sphinx_theme"
+ html_logo = '_static/spyder_logo.png'
+ html_theme_options = {
+     "external_links": [
diff --git a/dev-python/spyder/spyder-4.1.4.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild
index 184855914157..557c7b2359f0 100644
--- a/dev-python/spyder/spyder-4.1.4.ebuild
+++ b/dev-python/spyder/spyder-4.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_7 )
 
-inherit eutils xdg distutils-r1 virtualx
+inherit optfeature xdg distutils-r1 virtualx
 
 # Commit of documentation to fetch
 DOCS_PV="0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e"
diff --git a/dev-python/spyder/spyder-4.1.5.ebuild b/dev-python/spyder/spyder-4.1.5.ebuild
new file mode 100644
index 000000000000..d8bcd60bdc25
--- /dev/null
+++ b/dev-python/spyder/spyder-4.1.5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit eutils xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c"
+
+MYPV="${PV/_alpha/a}"
+
+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${MYPV}.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"
+
+# Extra indented 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.
+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/ipython-4.0[${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.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-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.34.0[${PYTHON_USEDEP}]
+
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+	dev-python/yapf[${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}]
+	>=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.4[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	<dev-python/coverage-5.0[${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-5.0[${PYTHON_USEDEP}]
+	<dev-python/pytest-faulthandler-2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-ordering[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/sympy[${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}/${PN}-4.1.2-build.patch"
+	"${FILESDIR}/${PN}-4.1.2-py3-only.patch"
+	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+	"TROUBLESHOOTING.md"
+)
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
+	rm external-deps/* -r || die
+
+	# do not depend on pyqt5<13
+	sed -i -e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+			setup.py || die
+
+	# do not check deps, fails because we removed pyqt5 dependency above
+	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
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.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
+
+	# 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
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here
+# test results should be checked for success manually
+python_test() {
+	${EPYTHON} runtests.py
+}
+
+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 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 "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
+}