Date: Sunday, November 19, 2017 @ 19:16:30 Author: muflone Revision: 267483
archrelease: copy trunk to community-testing-any Added: spyder/repos/community-testing-any/ spyder/repos/community-testing-any/PKGBUILD (from rev 267482, spyder/trunk/PKGBUILD) spyder/repos/community-testing-any/bug_51437_spyder2.patch (from rev 267482, spyder/trunk/bug_51437_spyder2.patch) spyder/repos/community-testing-any/bug_53489_python2-optional-nbconvert.patch (from rev 267482, spyder/trunk/bug_53489_python2-optional-nbconvert.patch) spyder/repos/community-testing-any/bug_54508_missing_pyqt4_qtwebkit.patch (from rev 267482, spyder/trunk/bug_54508_missing_pyqt4_qtwebkit.patch) spyder/repos/community-testing-any/python2.patch (from rev 267482, spyder/trunk/python2.patch) spyder/repos/community-testing-any/spyder2.install (from rev 267482, spyder/trunk/spyder2.install) --------------------------------------------+ PKGBUILD | 107 +++++++++++++++++++++++++++ bug_51437_spyder2.patch | 51 ++++++++++++ bug_53489_python2-optional-nbconvert.patch | 12 +++ bug_54508_missing_pyqt4_qtwebkit.patch | 24 ++++++ python2.patch | 17 ++++ spyder2.install | 8 ++ 6 files changed, 219 insertions(+) Copied: spyder/repos/community-testing-any/PKGBUILD (from rev 267482, spyder/trunk/PKGBUILD) =================================================================== --- community-testing-any/PKGBUILD (rev 0) +++ community-testing-any/PKGBUILD 2017-11-19 19:16:30 UTC (rev 267483) @@ -0,0 +1,107 @@ +# $Id$ +# Maintainer: Muflone http://www.muflone.com/contacts/english/ +# Contributor: Francois Boulogne <fboulo...@april.org> +# Contributor: TDY <t...@gmx.com> + +pkgbase='spyder' +pkgname=('spyder2' 'spyder3') +pkgver=3.2.4 +pkgrel=1 +pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.' +makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx') +arch=('any') +url='https://github.com/spyder-ide/spyder/' +license=('MIT') +source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgbase}/archive/v${pkgver}.tar.gz" + "python2.patch" + "bug_53489_python2-optional-nbconvert.patch" + "bug_54508_missing_pyqt4_qtwebkit.patch" + "bug_51437_spyder2.patch") +sha256sums=('5206a69193038fb29b6d0a5a68591c4222d2abdb058bdfef87081f0d48ea80be' + '84b8d5e9640d5d347ac4564130f217368cc3f823de30b458d467a05e60bbc8da' + '7486faba90da062ef8da6912bfabd22b59343b1275758f04e4a41df2b3b8eec0' + '28d4aa8938d809c299ab6bf6b00a2f82677f9a98a9763b7127970881b76276f5' + 'ae077fc95bc6861402a90c55bc11b3a2dda3fde4005e9d7ad65df3b1a120d8c1') + +prepare() { + cd "${pkgbase}-${pkgver}" + # Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508) + patch -p1 -i "../bug_54508_missing_pyqt4_qtwebkit.patch" + # Replace spyder with spyder2 (see https://bugs.archlinux.org/task/51437) + patch -p1 -i "../bug_51437_spyder2.patch" + mv "img_src/spyder.png" "img_src/spyder2.png" + mv "scripts/spyder.desktop" "scripts/spyder2.desktop" + + # Prepare sources for spyder2 build + cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/spyder2-${pkgver}" + cd "${srcdir}/spyder2-${pkgver}" + patch -p1 -i "../python2.patch" + patch -p1 -i "../bug_53489_python2-optional-nbconvert.patch" + + # Prepare sources for spyder3 build + cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/spyder3-${pkgver}" + cd "${srcdir}/spyder3-${pkgver}" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py build + + cd "${srcdir}/${pkgname}-${pkgver}" + python3 setup.py build +} + +package_spyder2() { + pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features for Python 2.x series.' + depends=('python2-pyqt5' 'qt5-webkit' 'python2-qtconsole' 'python2-qtpy' 'python2-qtawesome' + 'python2-pyflakes' 'python2-pyzmq' 'python2-pygments' 'python2-psutil' 'python2-pickleshare' + 'python2-rope' 'python2-jedi' 'python2-pylint' 'python2-pycodestyle' 'python2-sphinx' + 'icu' 'gtk-update-icon-cache') + provides=('spyder') + conflicts=('spyder') + replaces=('spyder') + optdepends=('python2-numpy: N-dimensional arrays' + 'python2-scipy: signal/image processing' + 'python2-h5py: HDF5 support' + 'python2-matplotlib: interactive 2D/3D data plotting' + 'python2-sympy: symbolic mathematics for the IPython console' + 'python2-pandas: view and edit DataFrames and Series in the Variable Explorer') + install="${pkgname}.install" + + cd "${pkgname}-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 + # Install license file + install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Install icon and desktop file + install -D -m644 "spyder/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg" + # Change main executable name + mv "${pkgdir}/usr/bin/spyder" "${pkgdir}/usr/bin/${pkgname}" + # Remove useless spyder_win_post_install script + rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py" +} + +package_spyder3() { + pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features for Python 3.x series.' + depends=('python-pyqt5' 'qt5-webkit' 'python-qtconsole' 'python-qtpy' 'python-qtawesome' + 'python-pyflakes' 'python-pyzmq' 'python-pygments' 'python-psutil' 'python-pickleshare' + 'jupyter' 'jupyter-nbconvert' + 'python-rope' 'python-jedi' 'python-pylint' 'python-pycodestyle' 'python-sphinx' + 'icu' 'gtk-update-icon-cache') + optdepends=('python-numpy: N-dimensional arrays' + 'python-scipy: signal/image processing' + 'python-h5py: HDF5 support' + 'python-matplotlib: interactive 2D/3D data plotting' + 'python-sympy: symbolic mathematics for the IPython console' + 'python-pandas: view and edit DataFrames and Series in the Variable Explorer') + + cd "${pkgname}-${pkgver}" + python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 + # Install license file + install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Install icon and desktop file + install -D -m644 "spyder/images/spyder.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg" + # Remove useless spyder_win_post_install script + rm -f "${pkgdir}/usr/bin/spyder_win_post_install.py" + # Add symlink /usr/bin/spyder to /usr/bin/spyder3 (see https://bugs.archlinux.org/task/51437) + ln -s "/usr/bin/spyder3" "${pkgdir}/usr/bin/spyder" +} Copied: spyder/repos/community-testing-any/bug_51437_spyder2.patch (from rev 267482, spyder/trunk/bug_51437_spyder2.patch) =================================================================== --- community-testing-any/bug_51437_spyder2.patch (rev 0) +++ community-testing-any/bug_51437_spyder2.patch 2017-11-19 19:16:30 UTC (rev 267483) @@ -0,0 +1,51 @@ +diff -Naur spyder-3.1.4.orig/scripts/spyder3.desktop spyder-3.1.4/scripts/spyder3.desktop +--- spyder-3.1.4.orig/scripts/spyder3.desktop 2017-04-24 02:30:23.000000000 +0200 ++++ spyder-3.1.4/scripts/spyder3.desktop 2017-08-12 20:49:55.349203674 +0200 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Version=1.0 + Type=Application +-Name=Spyder3 +-GenericName=Spyder3 +-Comment=Scientific PYthon Development EnviRonment - Python3 ++Name=Spyder for Python 3.x ++Comment=Scientific PYthon Development EnviRonment - Python 3.x + TryExec=spyder3 + Exec=spyder3 %F + Categories=Development;Science;IDE;Qt; +diff -Naur spyder-3.1.4.orig/scripts/spyder.desktop spyder-3.1.4/scripts/spyder.desktop +--- spyder-3.1.4.orig/scripts/spyder.desktop 2017-04-24 02:30:23.000000000 +0200 ++++ spyder-3.1.4/scripts/spyder.desktop 2017-08-12 20:49:54.005881501 +0200 +@@ -1,13 +1,12 @@ + [Desktop Entry] + Version=1.0 + Type=Application +-Name=Spyder +-GenericName=Spyder +-Comment=Scientific PYthon Development EnviRonment +-TryExec=spyder +-Exec=spyder %F ++Name=Spyder for Python 2.x ++Comment=Scientific PYthon Development EnviRonment - Python 2.x ++TryExec=spyder2 ++Exec=spyder2 %F + Categories=Development;Science;IDE;Qt; +-Icon=spyder ++Icon=spyder2 + Terminal=false + StartupNotify=true + MimeType=text/x-python; +diff -Naur spyder-3.1.4.orig/setup.py spyder-3.1.4/setup.py +--- spyder-3.1.4.orig/setup.py 2017-04-24 02:30:23.000000000 +0200 ++++ spyder-3.1.4/setup.py 2017-08-12 20:34:09.464160097 +0200 +@@ -82,8 +82,8 @@ + ('share/pixmaps', ['img_src/spyder3.png']), + ('share/metainfo', ['scripts/spyder3.appdata.xml'])] + else: +- data_files = [('share/applications', ['scripts/spyder.desktop']), +- ('share/pixmaps', ['img_src/spyder.png'])] ++ data_files = [('share/applications', ['scripts/spyder2.desktop']), ++ ('share/pixmaps', ['img_src/spyder2.png'])] + elif os.name == 'nt': + data_files = [('scripts', ['img_src/spyder.ico', + 'img_src/spyder_reset.ico'])] Copied: spyder/repos/community-testing-any/bug_53489_python2-optional-nbconvert.patch (from rev 267482, spyder/trunk/bug_53489_python2-optional-nbconvert.patch) =================================================================== --- community-testing-any/bug_53489_python2-optional-nbconvert.patch (rev 0) +++ community-testing-any/bug_53489_python2-optional-nbconvert.patch 2017-11-19 19:16:30 UTC (rev 267483) @@ -0,0 +1,12 @@ +diff -Naur spyder-3.2.0.orig/spyder/plugins/editor.py spyder-3.2.0/spyder/plugins/editor.py +--- spyder-3.2.0.orig/spyder/plugins/editor.py 2017-07-24 05:03:40.000000000 +0200 ++++ spyder-3.2.0/spyder/plugins/editor.py 2017-08-12 21:45:09.455757449 +0200 +@@ -56,7 +56,7 @@ + # Dependencies + NBCONVERT_REQVER = ">=4.0" + dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"), +- required_version=NBCONVERT_REQVER) ++ required_version=NBCONVERT_REQVER, optional=True) + + + def _load_all_breakpoints(): Copied: spyder/repos/community-testing-any/bug_54508_missing_pyqt4_qtwebkit.patch (from rev 267482, spyder/trunk/bug_54508_missing_pyqt4_qtwebkit.patch) =================================================================== --- community-testing-any/bug_54508_missing_pyqt4_qtwebkit.patch (rev 0) +++ community-testing-any/bug_54508_missing_pyqt4_qtwebkit.patch 2017-11-19 19:16:30 UTC (rev 267483) @@ -0,0 +1,24 @@ +diff -Naur spyder-3.1.4.orig/scripts/spyder spyder-3.1.4/scripts/spyder +--- spyder-3.1.4.orig/scripts/spyder 2017-04-24 02:30:23.000000000 +0200 ++++ spyder-3.1.4/scripts/spyder 2017-07-09 18:47:22.072698407 +0200 +@@ -1,3 +1,8 @@ + #!/usr/bin/env python ++ ++# Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508) ++import os ++os.environ['QT_API'] = 'pyqt5' ++ + from spyder.app import start + start.main() +diff -Naur spyder-3.1.4.orig/scripts/spyder3 spyder-3.1.4/scripts/spyder3 +--- spyder-3.1.4.orig/scripts/spyder3 2017-04-24 02:30:23.000000000 +0200 ++++ spyder-3.1.4/scripts/spyder3 2017-07-09 18:47:27.659425267 +0200 +@@ -1,3 +1,8 @@ + #! /usr/bin/python3 ++ ++# Forced QT API to pyqt5 (see https://bugs.archlinux.org/task/54508) ++import os ++os.environ['QT_API'] = 'pyqt5' ++ + from spyder.app import start + start.main() Copied: spyder/repos/community-testing-any/python2.patch (from rev 267482, spyder/trunk/python2.patch) =================================================================== --- community-testing-any/python2.patch (rev 0) +++ community-testing-any/python2.patch 2017-11-19 19:16:30 UTC (rev 267483) @@ -0,0 +1,17 @@ +diff -Naur spyder-3.2.0.orig/scripts/spyder spyder-3.2.0/scripts/spyder +--- spyder-3.2.0.orig/scripts/spyder 2017-07-24 05:03:40.000000000 +0200 ++++ spyder-3.2.0/scripts/spyder 2017-08-12 21:22:11.230212853 +0200 +@@ -1,3 +1,3 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + from spyder.app import start + start.main() +diff -Naur spyder-3.2.0.orig/spyder/app/restart.py spyder-3.2.0/spyder/app/restart.py +--- spyder-3.2.0.orig/spyder/app/restart.py 2017-07-24 05:03:40.000000000 +0200 ++++ spyder-3.2.0/spyder/app/restart.py 2017-08-12 21:22:11.230212853 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # -*- coding: utf-8 -*- + # + # Copyright © Spyder Project Contributors Copied: spyder/repos/community-testing-any/spyder2.install (from rev 267482, spyder/trunk/spyder2.install) =================================================================== --- community-testing-any/spyder2.install (rev 0) +++ community-testing-any/spyder2.install 2017-11-19 19:16:30 UTC (rev 267483) @@ -0,0 +1,8 @@ +post_install() { + echo "==> The /usr/bin/spyder executable is now a symlink for spyder3 (in the spyder3 package)." + echo "==> The executable file for spyder2 is now /usr/bin/spyder2" +} + +post_upgrade() { + post_install +}