public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/, dev-python/spyder/
@ 2016-12-12 14:36 Andrey Grozin
  0 siblings, 0 replies; 7+ messages in thread
From: Andrey Grozin @ 2016-12-12 14:36 UTC (permalink / raw
  To: gentoo-commits

commit:     e2f891011f3883c81282af06d0cbf522f8c71040
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 14:34:30 2016 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 14:35:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f89101

dev-python/spyder: bump to 3.0.2

Bug: 602242

Package-Manager: portage-2.3.3

 dev-python/spyder/Manifest                       |   1 +
 dev-python/spyder/files/spyder-3.0.2-build.patch | 140 +++++++++++++++++++++++
 dev-python/spyder/spyder-3.0.2.ebuild            |  58 ++++++++++
 3 files changed, 199 insertions(+)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 33c206d..0e39a3c 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -2,3 +2,4 @@ DIST spyder-2.3.4.zip 3707063 SHA256 da4b13d6faed3e8810c0418f8274b26fde4f265ea4f
 DIST spyder-2.3.5.2.zip 3039104 SHA256 40e589467b561af534aac6d8cc2ea0dc244d3ae4457afb41b3aec6db6f8b2336 SHA512 ac8e078991b2889c3359e700bd89d4c8487eeba412512bc9bd7685214f687001bcc411016283bcde4eb73f6186ffc5cadc9614d911acd8b788899ef5aafd66e1 WHIRLPOOL e2b2bca44bd2ec1461875a358868ab34c60f30ac5164ff6312302b495e859000b97afc78ce12c69dbc328fdcbead247a9defce9e29c08de367fc7d3a321ff007
 DIST spyder-2.3.8.zip 3043528 SHA256 99fdae2cea325c0f2842c77bd67dd22db19fef3d9c0dde1545b1a2650eae517e SHA512 7d40e081ce2ea579d8d98e58e31b53afc04360bebcd52a226adc5ed387ed94d1aa24d0372c2e3594689d0f44a81df9986d8c3fbe4ccbae7a493ad039aaba3acc WHIRLPOOL dfd1edb2006c89df1a5bbc9d42a5e4e0042691fbcef71f855af6c0111f2b38bb88aef61ac00cfe8fed574e631af295aacb6d784d184ddb107e46616ce3a65e01
 DIST spyder-2.3.9.zip 3043753 SHA256 9b69df9abc7805fead522a8a1fe5b680bd0d07922564dde51c040e9f3fcb7349 SHA512 8808e0680779ffd0d3fad628bb9675babbede4ff92673786a8f4258ed5a0903a314c8db217e3f7aea0232282548c622df44541e14daa57b167732ff787a96166 WHIRLPOOL 8f8aa136216fe42d3d454211a9f8cf1f69dabce535f8a4fb5841fff3919141f957d90543e21c6809df2d0629e5011a66b5c1bdb6e1fe7fadb95a3081ef3a604e
+DIST spyder-3.0.2.tar.gz 3207709 SHA256 c308cae5d963a7332548db2dd91ebf105263eb493ce208221a59ad77592399c1 SHA512 7f3723bd98876aa4769877327a93aa02510689708012afc72148c67acd91ab134501ae57471d9cf0e17c9e3892a541b7730a2392ace3c6525443058d0ed01612 WHIRLPOOL 5f1f278fa3c6a98b8d7050bb32e9186cd7053e21d9050bf92b29088154ea3494995bf9953e04d63db4c71ccc37d3a2cdd7e38222b1f82decc2b763144cdf3642

diff --git a/dev-python/spyder/files/spyder-3.0.2-build.patch b/dev-python/spyder/files/spyder-3.0.2-build.patch
new file mode 100644
index 00000000..f476401
--- /dev/null
+++ b/dev-python/spyder/files/spyder-3.0.2-build.patch
@@ -0,0 +1,140 @@
+diff -r -U3 spyder-3.0.2.orig/setup.py spyder-3.0.2/setup.py
+--- spyder-3.0.2.orig/setup.py	2016-10-25 07:05:22.000000000 +0700
++++ spyder-3.0.2/setup.py	2016-12-12 19:44:13.840412632 +0700
+@@ -77,12 +77,7 @@
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder3.png'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder.png'])]
++        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]
+@@ -105,111 +100,9 @@
+ 
+ 
+ #==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-#==============================================================================
+-# Sphinx build (documentation)
+-#==============================================================================
+-def get_html_help_exe():
+-    """Return HTML Help Workshop executable path (Windows only)"""
+-    if os.name == 'nt':
+-        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
+-        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
+-            if osp.isfile(hhc_exe):
+-                return hhc_exe
+-        else:
+-            return
+-
+-try:
+-    from sphinx import setup_command
+-
+-    class MyBuild(build):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + build.user_options
+-        def __init__(self, *args, **kwargs):
+-            build.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-        def with_doc(self):
+-            setup_dir = os.path.dirname(os.path.abspath(__file__))
+-            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
+-            install_obj = self.distribution.get_command_obj('install')
+-            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
+-        sub_commands = build.sub_commands + [('build_doc', with_doc)]
+-    CMDCLASS['build'] = MyBuild
+-
+-
+-    class MyInstall(install):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + install.user_options
+-        def __init__(self, *args, **kwargs):
+-            install.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-    CMDCLASS['install'] = MyInstall
+-
+-
+-    class MyBuildDoc(setup_command.BuildDoc):
+-        def run(self):
+-            build = self.get_finalized_command('build')
+-            sys.path.insert(0, os.path.abspath(build.build_lib))
+-            dirname = self.distribution.get_command_obj('build').build_purelib
+-            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
+-
+-            if not osp.exists(self.builder_target_dir):
+-                os.mkdir(self.builder_target_dir)
+-
+-            hhc_exe = get_html_help_exe()
+-            self.builder = "html" if hhc_exe is None else "htmlhelp"
+-
+-            try:
+-                setup_command.BuildDoc.run(self)
+-            except UnicodeDecodeError:
+-                print("ERROR: unable to build documentation because Sphinx "\
+-                      "do not handle source path with non-ASCII characters. "\
+-                      "Please try to move the source package to another "\
+-                      "location (path with *only* ASCII characters).",
+-                      file=sys.stderr)
+-            sys.path.pop(0)
+-
+-            # Building chm doc, if HTML Help Workshop is installed
+-            if hhc_exe is not None:
+-                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
+-                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
+-                if osp.isfile(fname):
+-                    dest = osp.join(dirname, 'spyder')
+-                    try:
+-                        shutil.move(fname, dest)
+-                    except shutil.Error:
+-                        print("Unable to replace %s" % dest)
+-                    shutil.rmtree(self.builder_target_dir)
+-
+-    CMDCLASS['build_doc'] = MyBuildDoc
+-except ImportError:
+-    print('WARNING: unable to build documentation because Sphinx '\
+-          'is not installed', file=sys.stderr)
+-
+-
+-#==============================================================================
+ # Main scripts
+ #==============================================================================
+-# NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+-# platforms due to a bug in pip installation process (see Issue 1158)
+-SCRIPTS = ['%s_win_post_install.py' % NAME]
+-if PY3 and sys.platform.startswith('linux'):
+-    SCRIPTS.append('spyder3')
+-else:
+-    SCRIPTS.append('spyder')
++SCRIPTS = ['spyder']
+ 
+ 
+ #==============================================================================
+@@ -259,8 +152,7 @@
+                    'Programming Language :: Python :: 3',
+                    'Development Status :: 5 - Production/Stable',
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=CMDCLASS)
++                   'Topic :: Software Development :: Widget Sets'])
+ 
+ 
+ #==============================================================================

diff --git a/dev-python/spyder/spyder-3.0.2.ebuild b/dev-python/spyder/spyder-3.0.2.ebuild
new file mode 100644
index 00000000..7a7c61c
--- /dev/null
+++ b/dev-python/spyder/spyder-3.0.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Python IDE with matlab-like features"
+HOMEPAGE="https://github.com/spyder-ide/spyder/ https://pypi.python.org/pypi/spyder/ http://pythonhosted.org/spyder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc hdf5"
+
+RDEPEND="
+	|| ( dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
+		dev-python/PyQt4[${PYTHON_USEDEP},svg,webkit]
+		dev-python/pyside[${PYTHON_USEDEP},svg,webkit] )
+	dev-python/QtPy[${PYTHON_USEDEP},svg,webkit]
+	dev-python/qtconsole[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/rope[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/rope_py3k[${PYTHON_USEDEP}]' python3_4 python3_5)
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/qtawesome[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+# Courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc doc/html || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	doicon spyder/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/, dev-python/spyder/
@ 2020-02-19  7:34 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2020-02-19  7:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6b31016c4e658c7f79afe69b3e5579c9ccfae2d8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 13 14:00:25 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 07:02:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b31016c

dev-python/spyder: Clean up 4.0.0_beta versions

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/spyder/Manifest                         |  1 -
 .../spyder/files/spyder-4.0.0_beta1-build.patch    | 49 --------------
 dev-python/spyder/spyder-4.0.0_beta1.ebuild        | 77 ----------------------
 3 files changed, 127 deletions(-)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 14caae6bac5..24947a0ce42 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -2,6 +2,5 @@ DIST spyder-3.2.4.tar.gz 3345797 BLAKE2B 2df946f257fee7e87dd922b6ed3b3c0fa024385
 DIST spyder-3.2.8.tar.gz 3414627 BLAKE2B 95f85f719eba20eb9fed5183cfac582b040abc93724df512188d14167a1663c5be9906dfc499feda9f8b0d7a713c093dbf98e4f20f732e0e9669397e1b7c8482 SHA512 03dea90632af510cfc8c4cc684068213a54dac9eef671f04c83663dd40eb480a4b818e2d040efa7a78a0d17044018aa76f2931abbf344eb684094fc7a86ddf5e
 DIST spyder-3.3.0.tar.gz 2782654 BLAKE2B e85ef52109c723d6b1b011f0e81ab3a46d3e0e6ba72fd34a1eda9ed650c9e03532e8fd72e05365367f62035a6f03d6ec32d35314c54438bf639070c7bebfb4d6 SHA512 53a2b438afe245092eda4d202d2453b5b93d6682aafcdb00bf251ddcdb30cee2d81d8adadbe23fa36f64fa5f917b327690cb8f9e2cf5c0da2841b5eda648a26f
 DIST spyder-3.3.1.tar.gz 2786730 BLAKE2B d906b5750cb620db41aec514a64d132b9ee5a992047828faffe11af5abd22d0cec7b876dfe79c6d378804373e8db5c661214f5730833e7599bf13b80d4dc16d6 SHA512 91d648a2717b5d5386115ba800fdd98884e609b213007dbaa09c7d16335f1b9ec3d0bc6b32d1677db8c2704e990e70eaa04d6d1efc800008cddfa511105e9c68
-DIST spyder-4.0.0b1.tar.gz 2986758 BLAKE2B 7fa918a569ed26d1d71ea7bce725f1b7d5db54badf3fb7bad1265d93f2ebdf25b1246acefb4f8517a6f34968bf8f12331958afcf72fc3c162e0d06d9dc4d4c72 SHA512 5751434b7ffac4d1e0c535f8a842656c3a306ed3d8a275a06a0eb57d3cd9bb36d01341723159292cba8616fcadc7157387fdb334b2ab0efbc1bb6b920102015a
 DIST spyder-4.0.1-docs.tar.gz 2257654 BLAKE2B a1d245c018d551e639d5acc862e09132ba80411c745430a5d16ff137c12919ec0b6e32d180aa629ba8dce3776826d754a4e843647b642086565e7a00c6dca94a SHA512 a62a1fd39833d827a2f9be357a2ed82eca37cc096a20a91030af8746d401b517d76a4f6a036c76eaa8355a88db6b2be8009e6b58d5539b57c43091677e93e62c
 DIST spyder-4.0.1.tar.gz 10783565 BLAKE2B 5d264991b9bfc8118ef91f929269a300932cb0078b70c54613836c4337dc41214aa4ab81dacb4a535aaa6dea6b1eb591e25c7071664dc102e218373a0d7f8824 SHA512 9249a3b4a73ebe7a485d75fe2bea68bfa106c8ad0710120a6e05a43e3e2a65f9076904d1104180e925ab282b1d9da712c3509e0a5a7cfe3bd5ea8a95a1617bdd

diff --git a/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch b/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch
deleted file mode 100644
index 2b0f9bc699f..00000000000
--- a/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -r -U3 spyder-4.0.0b1.orig/setup.py spyder-4.0.0b1/setup.py
---- spyder-4.0.0b1.orig/setup.py	2018-08-12 04:35:49.000000000 +0700
-+++ spyder-4.0.0b1/setup.py	2018-08-14 20:25:32.827148778 +0700
-@@ -83,12 +83,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-@@ -112,21 +107,6 @@
- 
- 
- #==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -210,8 +190,7 @@
-                  'Intended Audience :: Science/Research',
-                  'Intended Audience :: Developers',
-                  'Topic :: Scientific/Engineering',
--                 'Topic :: Software Development :: Widget Sets'],
--    cmdclass=CMDCLASS)
-+                 'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================

diff --git a/dev-python/spyder/spyder-4.0.0_beta1.ebuild b/dev-python/spyder/spyder-4.0.0_beta1.ebuild
deleted file mode 100644
index 7800f95826f..00000000000
--- a/dev-python/spyder/spyder-4.0.0_beta1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 xdg-utils
-MY_P=${P/_beta/b}
-
-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="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.11.0[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/numpydoc[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/, dev-python/spyder/
@ 2020-04-13  8:31 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2020-04-13  8:31 UTC (permalink / raw
  To: gentoo-commits

commit:     b17b16911ca6cb6388ebb4b25d1821d915bfb693
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Apr 11 20:13:55 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 08:31:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17b1691

dev-python/spyder: clean up old

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/15313
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/spyder/Manifest                         |   2 -
 dev-python/spyder/files/spyder-4.1.1-build.patch   |  35 -----
 .../spyder/files/spyder-4.1.1-py3-only.patch       |  55 -------
 dev-python/spyder/spyder-4.1.1-r2.ebuild           | 163 ---------------------
 4 files changed, 255 deletions(-)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index b99d72237a4..a4f09dcf716 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,4 +1,2 @@
-DIST spyder-4.1.1.tar.gz 11135335 BLAKE2B fc253ea266b368f372f2f0de30120d58c0e5c6e4cf474ccec0884c5fd3557cbd929eb17c0b9f2ee04745861499e12f54e61566507d844c9cf804bef65b3438d4 SHA512 e778dbac4c3f3462c32c9117ce6f6a8e5f2c8df5317695d76bf7a61995cac7be2e224cb751eda337b32442c9a32a7d53f8779a9288f15ad8d1a7aac9d328237c
 DIST spyder-4.1.2.tar.gz 11125567 BLAKE2B 38591301fa9d97836341c9e86134fee1515ce901f42aeb45f606f23f5da7411e45e98e872dda0f0de4504e062eb6aa188d3db15181074220e69624a6b28dd8f6 SHA512 a0aeb1f7eb66f2efd5bb7da6ed7401668ca76e968b9b651882567664925be22ba0748914477876e2c62761442c57fa69c19a9fc6556251ac6db83bcd6088d000
 DIST spyder-docs-1022fd8.tar.gz 3539049 BLAKE2B 6d54a990ab681e9ed8a5f1a03e59e86c29eb94af18f29dd6c3b8b782230974cf057d25993b0e0358d0f32aba3fd8740dc94fb173766c094e7954d9f39456e6a5 SHA512 84935fb0665e1981c319484ba97096bf6996cc618d073417d06f3dfb703366429be333203af3ff2fe124cf00cc72e416fbc97734be4e21e9200b104fea167933
-DIST spyder-docs-7c0b590.tar.gz 2257637 BLAKE2B 7e9528fde453631227ece3bd8c9163a0b3daadf3a83160b5475f943c49e7a559ff33dfe03531240b99571c535887ecff8459116d566dd7c739c74c4165e00060 SHA512 4d9548cc69db85ae6e93cac64e680460da6f9e76bf8b1265b31fbd4925786d29427de40bf06fd52ba807b0bb8f6c224e35b809c0e015a77013deb383e6d666f8

diff --git a/dev-python/spyder/files/spyder-4.1.1-build.patch b/dev-python/spyder/files/spyder-4.1.1-build.patch
deleted file mode 100644
index 7463550fc16..00000000000
--- a/dev-python/spyder/files/spyder-4.1.1-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r -U3 spyder-4.0.0b1.orig/setup.py spyder-4.0.0b1/setup.py
---- spyder-4.0.0b1.orig/setup.py	2018-08-12 04:35:49.000000000 +0700
-+++ spyder-4.0.0b1/setup.py	2018-08-14 20:25:32.827148778 +0700
-@@ -112,21 +107,6 @@
- 
- 
- #==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -210,8 +190,7 @@
-                  'Intended Audience :: Science/Research',
-                  'Intended Audience :: Developers',
-                  'Topic :: Scientific/Engineering',
--                 'Topic :: Software Development :: Widget Sets'],
--    cmdclass=CMDCLASS)
-+                 'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================

diff --git a/dev-python/spyder/files/spyder-4.1.1-py3-only.patch b/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
deleted file mode 100644
index afdc92a1e12..00000000000
--- a/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2d5d58b..4adc952 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,13 +31,6 @@ import shutil
- from distutils.core import setup
- from distutils.command.install_data import install_data
- 
--
--#==============================================================================
--# Check for Python 3
--#==============================================================================
--PY3 = sys.version_info[0] == 3
--
--
- #==============================================================================
- # Minimal Python version sanity check
- # Taken from the notebook setup.py -- Modified BSD License
-@@ -87,13 +80,8 @@ def get_subpackages(name):
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/icons', ['img_src/spyder.png'])]
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-+                      ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-                                    'img_src/spyder_reset.ico'])]
-@@ -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:
-+if sys.platform.startswith('linux'):
-     SCRIPTS.append('spyder')
- 
- if os.name == 'nt':
-@@ -269,8 +255,7 @@ if 'setuptools' in sys.modules:
- 
-     setup_args['entry_points'] = {
-         'gui_scripts': [
--            '{} = spyder.app.start:main'.format(
--                'spyder3' if PY3 else 'spyder')
-+            '{} = spyder.app.start:main'.format('spyder')
-         ]
-     }
- 

diff --git a/dev-python/spyder/spyder-4.1.1-r2.ebuild b/dev-python/spyder/spyder-4.1.1-r2.ebuild
deleted file mode 100644
index 7d3574a8257..00000000000
--- a/dev-python/spyder/spyder-4.1.1-r2.ebuild
+++ /dev/null
@@ -1,163 +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}]
-	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"
-)
-
-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
-
-	# 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
-	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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/, dev-python/spyder/
@ 2021-01-16  8:05 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2021-01-16  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8002266d0971d60df3d5653b5c4ad83ad257c4c7
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Dec 19 15:14:50 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 08:02:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8002266d

dev-python/spyder: version bump 4.2.1

Closes: https://bugs.gentoo.org/755242
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/18724
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/spyder/Manifest                       |   2 +
 dev-python/spyder/files/spyder-4.2.1-build.patch |  36 ++++
 dev-python/spyder/spyder-4.2.1.ebuild            | 241 +++++++++++++++++++++++
 3 files changed, 279 insertions(+)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 9932a8792c8..36a21c34b90 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,2 +1,4 @@
 DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
+DIST spyder-4.2.1.tar.gz 12156626 BLAKE2B 4a009c8b2ebe1b71bb60c568d5e6a3d7616fba7f9988669e97a2454b6369421a8603495271ad4c275cae9ad7207f2666b28ecccb121b4cc5554a3d1a863a1579 SHA512 56975e851a05dd023d851adaff8e9a747f9b1aa626db8ce65f805e41c5c47dba017332e81bf9efaae65671e06bc7632a519def286568a8ed2f48b41aa285de62
+DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d

diff --git a/dev-python/spyder/files/spyder-4.2.1-build.patch b/dev-python/spyder/files/spyder-4.2.1-build.patch
new file mode 100644
index 00000000000..38d3356b0b3
--- /dev/null
+++ b/dev-python/spyder/files/spyder-4.2.1-build.patch
@@ -0,0 +1,36 @@
+diff --git a/setup.py b/setup.py
+index 0c47210..20b95c0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -97,21 +97,6 @@ def get_packages():
+     return packages
+ 
+ 
+-#==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+ #==============================================================================
+ # Main scripts
+ #==============================================================================
+@@ -177,8 +162,7 @@ def run(self):
+         'Intended Audience :: Developers',
+         'Topic :: Scientific/Engineering',
+         'Topic :: Software Development :: Widget Sets'
+-    ],
+-    cmdclass=CMDCLASS)
++    ])
+ 
+ 
+ #==============================================================================

diff --git a/dev-python/spyder/spyder-4.2.1.ebuild b/dev-python/spyder/spyder-4.2.1.ebuild
new file mode 100644
index 00000000000..858a74eb402
--- /dev/null
+++ b/dev-python/spyder/spyder-4.2.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="5c9c8a3317045c2d301e05b751943be9b521d129"
+
+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"
+
+# The test suite often hangs or does not work.
+# Technically spyder requires pyqt5<13, which
+# we do not have in ::gentoo any more. Likely
+# this is the reason many of the tests fail
+# or hang. RESTRICTing because IMO it is
+# not worth the several hours I spend every
+# single version bump checking which tests
+# do and do not work. Spyder itself works
+# fine with pyqt5>13.
+RESTRICT="test"
+
+# 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.
+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[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${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}]
+	>=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.36.2[${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/pyls-black-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.3.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-5.0.1[${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.10.1[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	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-6.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}]
+	dev-python/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.2.1-build.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"
+)
+
+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
+	# runs against things packaged in external-deps dir
+	rm conftest.py || 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
+
+	# 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
+
+	# 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: 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
+
+	# Fatal Python error: Aborted
+	sed -i -e 's:test_module_completion:_&:' \
+		spyder/utils/introspection/tests/test_modulecompletion.py || die
+
+	# assert 0 > 0
+	sed -i -e 's:test_maininterpreter_page:_&:' \
+		spyder/preferences/tests/test_config_dialog.py || die
+
+	# This hangs forever
+	sed -i -e 's:test_load_kernel_file:_&:' \
+		-e 's:test_load_kernel_file_from_location:_&:' \
+		-e 's:test_load_kernel_file_from_id:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.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" dev-python/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/, dev-python/spyder/
@ 2021-04-09 12:21 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2021-04-09 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     16aff45e795dc23a1544b0608fdfc8ad79d9698a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Apr  3 11:51:32 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr  9 12:21:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16aff45e

dev-python/spyder: drop 4.2.0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/spyder/Manifest                       |   2 -
 dev-python/spyder/files/spyder-4.1.2-build.patch |  35 ----
 dev-python/spyder/spyder-4.2.0.ebuild            | 218 -----------------------
 3 files changed, 255 deletions(-)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 64e60affa54..873f9ac3b06 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,7 +1,5 @@
-DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
 DIST spyder-4.2.3.tar.gz 11539371 BLAKE2B aecd2e9772c52e644e9c0503195e380fffecdfaa5aea3f00a64e98a969faf3de4e0d8eb0515cc59893f28deb7733403826e90e36006ad7f8f4d67e8ef5e64543 SHA512 9e56efab8862c21e7496d45e813d28c4e9be583275352b0a6e0a58e99f6c0234fa9862da66705839beacb971dde9b6edc253405d9d62853a3c4c9c9991844846
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-5.0.0.tar.gz 19967667 BLAKE2B 072d65949f83e8831a6c88ef5472401f7b6ef305dd193baea34d63ce865d49a1181d0282df2e4c0025ff928e6a0a6c13312fb69f3329343a45def6ee9f30b9d3 SHA512 c76355314c7f623fbcc99540c8ecc4b57c18f9c0551688b1e4016b4510262305837d1637df38f412314fc98abd2c359d834bf380300a46b098503db561f83177
 DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
-DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d

diff --git a/dev-python/spyder/files/spyder-4.1.2-build.patch b/dev-python/spyder/files/spyder-4.1.2-build.patch
deleted file mode 100644
index 7463550fc16..00000000000
--- a/dev-python/spyder/files/spyder-4.1.2-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r -U3 spyder-4.0.0b1.orig/setup.py spyder-4.0.0b1/setup.py
---- spyder-4.0.0b1.orig/setup.py	2018-08-12 04:35:49.000000000 +0700
-+++ spyder-4.0.0b1/setup.py	2018-08-14 20:25:32.827148778 +0700
-@@ -112,21 +107,6 @@
- 
- 
- #==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -210,8 +190,7 @@
-                  'Intended Audience :: Science/Research',
-                  'Intended Audience :: Developers',
-                  'Topic :: Scientific/Engineering',
--                 'Topic :: Software Development :: Widget Sets'],
--    cmdclass=CMDCLASS)
-+                 'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================

diff --git a/dev-python/spyder/spyder-4.2.0.ebuild b/dev-python/spyder/spyder-4.2.0.ebuild
deleted file mode 100644
index 61c9697ed1a..00000000000
--- a/dev-python/spyder/spyder-4.2.0.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit optfeature 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"
-
-# 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.
-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-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipython-4.0[${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}]
-	>=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.36.1[${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/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.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.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? (
-	<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}]
-	dev-python/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.5-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.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
-	# runs against things packaged in external-deps dir
-	rm conftest.py || 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
-
-	# 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
-
-	# 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: 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
-}
-
-# 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
-
-	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" dev-python/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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/, dev-python/spyder/
@ 2021-05-19 18:42 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2021-05-19 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     54671cfd088026b4983a29abf04a124a8e75529d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Apr 16 17:45:32 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed May 19 18:41:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54671cfd

dev-python/spyder: add version 5.0.3

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/spyder/Manifest                         |   2 +
 .../files/spyder-5.0.1-doc-theme-renamed.patch     |  13 ++
 dev-python/spyder/spyder-5.0.3.ebuild              | 203 +++++++++++++++++++++
 3 files changed, 218 insertions(+)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 873f9ac3b06..61ffdf48423 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,5 +1,7 @@
 DIST spyder-4.2.3.tar.gz 11539371 BLAKE2B aecd2e9772c52e644e9c0503195e380fffecdfaa5aea3f00a64e98a969faf3de4e0d8eb0515cc59893f28deb7733403826e90e36006ad7f8f4d67e8ef5e64543 SHA512 9e56efab8862c21e7496d45e813d28c4e9be583275352b0a6e0a58e99f6c0234fa9862da66705839beacb971dde9b6edc253405d9d62853a3c4c9c9991844846
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-5.0.0.tar.gz 19967667 BLAKE2B 072d65949f83e8831a6c88ef5472401f7b6ef305dd193baea34d63ce865d49a1181d0282df2e4c0025ff928e6a0a6c13312fb69f3329343a45def6ee9f30b9d3 SHA512 c76355314c7f623fbcc99540c8ecc4b57c18f9c0551688b1e4016b4510262305837d1637df38f412314fc98abd2c359d834bf380300a46b098503db561f83177
+DIST spyder-5.0.3.tar.gz 20586502 BLAKE2B b8223273b638b57827f17037c47bb7bf53f19978fe9db343e354f557f4da17cfa03a36c013cab68b8b91b66495316a12d9652d864b8b089a495668b667a26b8c SHA512 c9b7c3a6755bc14ae84d8cd2c4166620a6fd1e83c097e2766f9f5190057775e4e3e9ba192d9eeb1cc434be11ac392f767239ae2d98cf40d95ffda4cf7cbeb358
+DIST spyder-docs-588cdf55cceffea7a3f31d98c0720bfe7df34b72.tar.gz 75780347 BLAKE2B c344ee0798e5780bfac5a8483c2992dfdddba5222fdd4a7c5603514bc612cc7300ec0cb49ebdcce6633d0cca8a5a36cfb5a2105c7f91febb5982dc2ea40fb86c SHA512 72f4644e872c57e229da8958a125bf405fa073ff99071b3555d97d8f8f71dc7b9f0dffbe61adf886e6bf3191894c639dd408d8dc76d65bc170bf7578b5b05558
 DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d

diff --git a/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch
new file mode 100644
index 00000000000..5edf7e854d0
--- /dev/null
+++ b/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/conf.py b/doc/conf.py
+index a3dc817..f428860 100644
+--- a/docs/doc/conf.py
++++ b/docs/doc/conf.py
+@@ -143,7 +143,7 @@
+ #
+ # CI = True
+ # TRAVIS_BRANCH = 'master'
+-html_theme = "pandas_sphinx_theme"
++html_theme = "pydata_sphinx_theme"
+ html_logo = '_static/images/spyder_logo.png'
+ html_theme_options = {
+     "external_links": [

diff --git a/dev-python/spyder/spyder-5.0.3.ebuild b/dev-python/spyder/spyder-5.0.3.ebuild
new file mode 100644
index 00000000000..c07dccb427f
--- /dev/null
+++ b/dev-python/spyder/spyder-5.0.3.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="588cdf55cceffea7a3f31d98c0720bfe7df34b72"
+
+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"
+
+# The test suite often hangs or does not work. Technically spyder requires
+# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
+# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
+# several hours I spend every single version bump checking which tests do and
+# do not work. Spyder itself works fine with pyqt5>13.
+RESTRICT="test"
+
+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-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${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}]
+	>=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/pyls-black-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
+	<dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
+	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.1.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-2.0.3[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
+"
+
+# python-language-server[all] deps
+RDEPEND+="
+	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-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+	dev-python/yapf[${PYTHON_USEDEP}]
+"
+
+# currently does not work with pyside2
+RDEPEND+="
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.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}]
+		dev-python/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}-5.0.0-build.patch"
+	"${FILESDIR}/${PN}-5.0.1-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+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 dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-language-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || 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
+
+	# 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
+
+	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
+
+	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" dev-python/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
+	elog
+	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
+	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/, dev-python/spyder/
@ 2021-11-24 23:31 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2021-11-24 23:31 UTC (permalink / raw
  To: gentoo-commits

commit:     dda2d5b468a0635829bf3d16a31b66539135490e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 23:30:01 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 23:31:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda2d5b4

dev-python/spyder: add version 5.2.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/spyder/Manifest                         |   2 +
 .../files/spyder-5.2.0-doc-theme-renamed.patch     |  13 ++
 dev-python/spyder/spyder-5.2.0.ebuild              | 199 +++++++++++++++++++++
 3 files changed, 214 insertions(+)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 24e64ac0ed62..d6c6ac781c22 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,8 @@
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
 DIST spyder-5.1.5.tar.gz 23849672 BLAKE2B a0a4db5105d4ecbb76bf3c996ea8ea17142bc4f9dfca989098ffdee32b620c711b343746e5dc5dce0c6c0a092a20b47d6bb28181c363f81af394bb8bccb5b6e2 SHA512 2204fe46ad3e4e14bebb51ef6a53074b657f6d970553decd0b2f9d0a7fba71b2f14b4efc3248bb4fb944860e85851e4a8add475ff12c6466e864be75b8cc38bb
+DIST spyder-5.2.0.tar.gz 23901277 BLAKE2B ce4846ce054ff484a30d38d836a2da23908e0793cb5ecaeaefe1b4171dcb038facfc19e8d80ca840b538b4effd97c9b8541c9e0af86e74f75acb5237b049c154 SHA512 9298c845a17f348bccbe93451f03aef0d4ee2bde2d3025ac7ed695b3e3c3941cb9852f7c56d676ca022a37020a647c93977e0845fe6f5686dd2598236a9c7d9c
 DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
+DIST spyder-docs-879e8a59a522444f1866485290933ed398a30c81.tar.gz 90033271 BLAKE2B fe1f1b2d9284c7d75ed90ebe496dbacc7c5cedb7202c6fa2031f7e5a59675080f5dbbc61293b8ed3e6b676e24fd8896f60c18821f9d31b57595a0f36076b4b8a SHA512 61d099c38efd588689ce1acb9d559fa9d0ca76a6e12cb6ed70b626aa445b9efacb9358393fbf9096987862ee57fb4b52a7b72461b46baea52b8447903fac587c
 DIST spyder-docs-a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c.tar.gz 88791917 BLAKE2B bdcf52965b592f4a88ee988afcca71ed73b0499397c8c0b7ff36c38d4408f4b76ff285b3d9739d1c126322fdd8c1c6b93f3017edcaf30563da02d8f509d09fe4 SHA512 2717dad17db836330820578c9082505b7f1126fef2a76284d03a443f3317e3a9a294f69e50f075a29580c4ad1bfbd23dcd02fcef93f32645ae5d52ecfb0b8f10

diff --git a/dev-python/spyder/files/spyder-5.2.0-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-5.2.0-doc-theme-renamed.patch
new file mode 100644
index 000000000000..08403d90fd9d
--- /dev/null
+++ b/dev-python/spyder/files/spyder-5.2.0-doc-theme-renamed.patch
@@ -0,0 +1,13 @@
+diff --git a/docs/doc/conf.py b/docs/doc/conf.py
+index 92a4b65..412fd39 100644
+--- a/docs/doc/conf.py
++++ b/docs/doc/conf.py
+@@ -145,7 +145,7 @@
+ #
+ # CI = True
+ # TRAVIS_BRANCH = 'master'
+-html_theme = "pandas_sphinx_theme"
++html_theme = "pydata_sphinx_theme"
+ html_logo = "_static/images/spyder_logo.png"
+ html_theme_options = {
+     "external_links": [

diff --git a/dev-python/spyder/spyder-5.2.0.ebuild b/dev-python/spyder/spyder-5.2.0.ebuild
new file mode 100644
index 000000000000..c760c5c3c69d
--- /dev/null
+++ b/dev-python/spyder/spyder-5.2.0.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="879e8a59a522444f1866485290933ed398a30c81"
+
+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"
+
+# The test suite often hangs or does not work. Technically spyder requires
+# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
+# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
+# several hours I spend every single version bump checking which tests do and
+# do not work. Spyder itself works fine with pyqt5>13.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jellyfish-0.7[${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/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/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.2.1[${PYTHON_USEDEP}]
+	<dev-python/qtconsole-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[tk,${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-ordering[${PYTHON_USEDEP}]
+		<dev-python/pytest-qt-4[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/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}-5.0.0-build.patch"
+	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+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 dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-lsp-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+		-e '/python-lsp-server/d' \
+		-e '/parso/d' \
+		-e '/jedi/d' \
+		-e '/pylint/d' \
+			requirements/conda.txt || die
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+			setup.py || die
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
+			spyder/dependencies.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
+
+	# 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
+
+	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
+
+	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" dev-python/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-11-24 23:31 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-09 12:21 [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/, dev-python/spyder/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2021-11-24 23:31 Andrew Ammerlaan
2021-05-19 18:42 Andrew Ammerlaan
2021-01-16  8:05 Joonas Niilola
2020-04-13  8:31 Joonas Niilola
2020-02-19  7:34 Joonas Niilola
2016-12-12 14:36 Andrey Grozin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox