commit: 5ee45e923b325092e82b015c3181fa54f30a7978 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Mon Mar 30 08:34:21 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Mar 30 11:26:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee45e92
dev-python/spyder: clean up Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/15170 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../files/spyder-4.1.1-allow-newer-parso.patch | 39 ----- dev-python/spyder/spyder-4.1.1-r1.ebuild | 158 --------------------- 2 files changed, 197 deletions(-) diff --git a/dev-python/spyder/files/spyder-4.1.1-allow-newer-parso.patch b/dev-python/spyder/files/spyder-4.1.1-allow-newer-parso.patch deleted file mode 100644 index 4b1c8d7b601..00000000000 --- a/dev-python/spyder/files/spyder-4.1.1-allow-newer-parso.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/requirements/conda.txt b/requirements/conda.txt -index 2e5e4e1..e5f427e 100644 ---- a/requirements/conda.txt -+++ b/requirements/conda.txt -@@ -14,7 +14,7 @@ keyring - nbconvert >=4.0 - numpydoc >=0.6.0 - Paramiko >=2.4.0 --parso =0.5.2 -+parso >=0.5.2 - pexpect >=4.4.0 - pickleshare >=0.4 - psutil >=5.3 -diff --git a/setup.py b/setup.py -index 2d5d58b..f008824 100644 ---- a/setup.py -+++ b/setup.py -@@ -218,7 +218,7 @@ install_requires = [ - 'numpydoc>=0.6.0', - # Required to get SSH connections to remote kernels - 'paramiko>=2.4.0;platform_system=="Windows"', -- 'parso==0.5.2', -+ 'parso>=0.5.2', - 'pexpect>=4.4.0', - 'pickleshare>=0.4', - 'psutil>=5.3', -diff --git a/spyder/dependencies.py b/spyder/dependencies.py -index 7c88ab6..60950a8 100644 ---- a/spyder/dependencies.py -+++ b/spyder/dependencies.py -@@ -41,7 +41,7 @@ KEYRING_REQVER = None - NBCONVERT_REQVER = '>=4.0' - NUMPYDOC_REQVER = '>=0.6.0' - PARAMIKO_REQVER = '>=2.4.0' --PARSO_REQVER = '=0.5.2' -+PARSO_REQVER = '>=0.5.2' - PEXPECT_REQVER = '>=4.4.0' - PICKLESHARE_REQVER = '>=0.4' - PSUTIL_REQVER = '>=5.3' diff --git a/dev-python/spyder/spyder-4.1.1-r1.ebuild b/dev-python/spyder/spyder-4.1.1-r1.ebuild deleted file mode 100644 index 0116d491f8c..00000000000 --- a/dev-python/spyder/spyder-4.1.1-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit eutils xdg distutils-r1 virtualx - -# Commit of documentation to fetch -DOCS_PV="7c0b590" - -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}] )" - -# 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}/${P}-allow-newer-parso.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 - - # 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 - 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 -}
