Date: Sunday, September 6, 2015 @ 18:28:52 Author: muflone Revision: 139266
archrelease: copy trunk to community-any Added: spyder/repos/community-any/PKGBUILD (from rev 139265, spyder/trunk/PKGBUILD) spyder/repos/community-any/python2.patch (from rev 139265, spyder/trunk/python2.patch) spyder/repos/community-any/spyder.install (from rev 139265, spyder/trunk/spyder.install) Deleted: spyder/repos/community-any/PKGBUILD spyder/repos/community-any/f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch spyder/repos/community-any/python2.patch spyder/repos/community-any/spyder.install ------------------------------------------------+ PKGBUILD | 163 +++++++++++------------ f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch | 116 ---------------- python2.patch | 78 +++++------ spyder.install | 24 +-- 4 files changed, 131 insertions(+), 250 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-09-06 16:28:36 UTC (rev 139265) +++ PKGBUILD 2015-09-06 16:28:52 UTC (rev 139266) @@ -1,83 +0,0 @@ -# $Id$ -# Maintainer: Muflone http://www.muflone.com/contacts/english/ -# Contributor: Francois Boulogne <fboulo...@april.org> -# Contributor: TDY <t...@gmx.com> - -pkgbase='spyder' -pkgname=('spyder' 'spyder3') -pkgver=2.3.5.2 -pkgrel=2 -pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.' -makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx') -arch=('any') -url='http://code.google.com/p/spyderlib/' -license=('MIT') -install="${pkgbase}.install" -source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgbase}/archive/v${pkgver}.tar.gz" - "python2.patch" - "f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch") -sha256sums=('fb7deef6d684c6dd6cce645e4589d5af70e4ef947277bf2ad70d50b9020dffd1' - '58a30ff9401c528176690f2081aed2fe3185c5baaf54ee6a1c127e9421bab96a' - '3525e1189a6c6e013f80da9c72f26975856191eddcbecf68ea062ef722e778c6') - -package_spyder() { - pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features for Python 2.x series.' - depends=('python2-pyqt4' 'python2-pyflakes' 'python2-pyzmq' 'python2-pygments' 'ipython2-notebook' - 'gtk-update-icon-cache') - optdepends=('python2-pylint: powerful code analysis' - 'python2-rope: editor code completion, calltips and go-to-definition' - 'python2-sphinx: rich text help on the object inspector' - 'python2-numpy: N-dimensional arrays' - 'python2-scipy: signal/image processing' - 'python2-psutil: memory/CPU usage in the status bar' - 'python2-h5py: HDF5 support' - 'python2-matplotlib: interactive 2D/3D data plotting' - 'python2-pep8: real-time code style analysis' - 'python2-sympy: symbolic mathematics for the IPython console' - 'python2-jedi: editor code completion, calltips and go-to-definition' - 'python2-pandas: view and edit DataFrames and Series in the Variable Explorer') - [ -d "build" ] && rm -rf "build" - cp -r "${pkgbase}-${pkgver}" build - cd build - patch -p1 -i "../python2.patch" - patch -p1 -i "../f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch" - python2 setup.py build - 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 "scripts/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -D -m644 "spyderlib/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" -} - -package_spyder3() { - pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features for Python 3.x series.' - depends=('python-pyqt4' 'python-pyflakes' 'python-pyzmq' 'python-pygments' 'jupyter' - 'gtk-update-icon-cache') - optdepends=('python-pylint: powerful code analysis' - 'python-rope: editor code completion, calltips and go-to-definition' - 'python-sphinx: rich text help on the object inspector' - 'python-numpy: N-dimensional arrays' - 'python-scipy: signal/image processing' - 'python-psutil: memory/CPU usage in the status bar' - 'python-h5py: HDF5 support' - 'python-matplotlib: interactive 2D/3D data plotting' - 'pep8: real-time code style analysis' - 'python-sympy: symbolic mathematics for the IPython console' - 'python-jedi: editor code completion, calltips and go-to-definition' - 'python-pandas: view and edit DataFrames and Series in the Variable Explorer') - [ -d "build" ] && rm -rf "build" - cp -r "${pkgbase}-${pkgver}" build - cd build - python3 setup.py build - 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 "scripts/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -D -m644 "spyderlib/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" -} Copied: spyder/repos/community-any/PKGBUILD (from rev 139265, spyder/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-09-06 16:28:52 UTC (rev 139266) @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: Muflone http://www.muflone.com/contacts/english/ +# Contributor: Francois Boulogne <fboulo...@april.org> +# Contributor: TDY <t...@gmx.com> + +pkgbase='spyder' +pkgname=('spyder' 'spyder3') +pkgver=2.3.6 +pkgrel=1 +pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.' +makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx') +arch=('any') +url='http://code.google.com/p/spyderlib/' +license=('MIT') +install="${pkgbase}.install" +source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgbase}/archive/v${pkgver}.tar.gz" + "python2.patch") +sha256sums=('2bcbfde9b7f577dc87808d5fce95c9b9c97a30cf58aec76ca7d41cdeceece4a1' + '58a30ff9401c528176690f2081aed2fe3185c5baaf54ee6a1c127e9421bab96a') + +package_spyder() { + pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features for Python 2.x series.' + depends=('python2-pyqt4' 'python2-pyflakes' 'python2-pyzmq' 'python2-pygments' 'ipython2-notebook' + 'gtk-update-icon-cache') + optdepends=('python2-pylint: powerful code analysis' + 'python2-rope: editor code completion, calltips and go-to-definition' + 'python2-sphinx: rich text help on the object inspector' + 'python2-numpy: N-dimensional arrays' + 'python2-scipy: signal/image processing' + 'python2-psutil: memory/CPU usage in the status bar' + 'python2-h5py: HDF5 support' + 'python2-matplotlib: interactive 2D/3D data plotting' + 'python2-pep8: real-time code style analysis' + 'python2-sympy: symbolic mathematics for the IPython console' + 'python2-jedi: editor code completion, calltips and go-to-definition' + 'python2-pandas: view and edit DataFrames and Series in the Variable Explorer') + [ -d "build" ] && rm -rf "build" + cp -r "${pkgbase}-${pkgver}" build + cd build + patch -p1 -i "../python2.patch" + python2 setup.py build + 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 "scripts/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -D -m644 "spyderlib/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" +} + +package_spyder3() { + pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features for Python 3.x series.' + depends=('python-pyqt4' 'python-pyflakes' 'python-pyzmq' 'python-pygments' 'jupyter' + 'gtk-update-icon-cache') + optdepends=('python-pylint: powerful code analysis' + 'python-rope: editor code completion, calltips and go-to-definition' + 'python-sphinx: rich text help on the object inspector' + 'python-numpy: N-dimensional arrays' + 'python-scipy: signal/image processing' + 'python-psutil: memory/CPU usage in the status bar' + 'python-h5py: HDF5 support' + 'python-matplotlib: interactive 2D/3D data plotting' + 'pep8: real-time code style analysis' + 'python-sympy: symbolic mathematics for the IPython console' + 'python-jedi: editor code completion, calltips and go-to-definition' + 'python-pandas: view and edit DataFrames and Series in the Variable Explorer') + [ -d "build" ] && rm -rf "build" + cp -r "${pkgbase}-${pkgver}" build + cd build + python3 setup.py build + 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 "scripts/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -D -m644 "spyderlib/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" +} Deleted: f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch =================================================================== --- f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch 2015-09-06 16:28:36 UTC (rev 139265) +++ f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch 2015-09-06 16:28:52 UTC (rev 139266) @@ -1,116 +0,0 @@ -diff -Naur spyder-2.3.5.2.orig/spyderlib/__init__.py spyder-2.3.5.2/spyderlib/__init__.py ---- spyder-2.3.5.2.orig/spyderlib/__init__.py 2015-06-23 04:12:07.000000000 +0200 -+++ spyder-2.3.5.2/spyderlib/__init__.py 2015-08-22 20:19:26.512473530 +0200 -@@ -62,11 +62,6 @@ - """Get version information for components used by Spyder""" - import sys - import platform -- # Hack to let IPython set QT_API, in case it's installed -- try: -- from IPython.external import qt # analysis:ignore -- except (ImportError, ValueError): -- pass - import spyderlib.qt - import spyderlib.qt.QtCore - -diff -Naur spyder-2.3.5.2.orig/spyderlib/qt/__init__.py spyder-2.3.5.2/spyderlib/qt/__init__.py ---- spyder-2.3.5.2.orig/spyderlib/qt/__init__.py 2015-06-23 04:12:07.000000000 +0200 -+++ spyder-2.3.5.2/spyderlib/qt/__init__.py 2015-08-22 20:20:24.309139778 +0200 -@@ -15,16 +15,18 @@ - API_NAME = {'pyqt': 'PyQt4', 'pyside': 'PySide'}[API] - - if API == 'pyqt': -- # We do not force QString, QVariant, ... API to #1 or #2 anymore -- # as spyderlib is now compatible with both APIs --# import sip --# try: --# sip.setapi('QString', 2) --# sip.setapi('QVariant', 2) --# except AttributeError: --# # PyQt < v4.6: in future version, we should warn the user --# # that PyQt is outdated and won't be supported by Spyder >v2.1 --# pass -+ # Since Spyder 2.3.6 we only support API #2 -+ import sip -+ try: -+ sip.setapi('QString', 2) -+ sip.setapi('QVariant', 2) -+ sip.setapi('QDate', 2) -+ sip.setapi('QDateTime', 2) -+ sip.setapi('QTextStream', 2) -+ sip.setapi('QTime', 2) -+ sip.setapi('QUrl', 2) -+ except AttributeError: -+ pass - try: - from PyQt4.QtCore import PYQT_VERSION_STR as __version__ - except ImportError: -@@ -32,7 +34,6 @@ - API = os.environ['QT_API'] = 'pyside' - API_NAME = 'PySide' - else: -- __version_info__ = tuple(__version__.split('.')+['final', 1]) - is_old_pyqt = __version__.startswith(('4.4', '4.5', '4.6', '4.7')) - is_pyqt46 = __version__.startswith('4.6') - import sip -diff -Naur spyder-2.3.5.2.orig/spyderlib/spyder.py spyder-2.3.5.2/spyderlib/spyder.py ---- spyder-2.3.5.2.orig/spyderlib/spyder.py 2015-06-23 04:12:07.000000000 +0200 -+++ spyder-2.3.5.2/spyderlib/spyder.py 2015-08-22 20:21:35.902472594 +0200 -@@ -41,7 +41,15 @@ - - - #============================================================================== --# Test if IPython is installed to eventually switch to PyQt API #2 -+# Check requirements -+#============================================================================== -+from spyderlib import requirements -+requirements.check_path() -+requirements.check_qt() -+ -+ -+#============================================================================== -+# IPython dependencies - #============================================================================== - from spyderlib.baseconfig import _ - from spyderlib.ipythonconfig import IPYTHON_QT_INSTALLED, SUPPORTED_IPYTHON -@@ -52,31 +60,6 @@ - dependencies.add("zmq", _("IPython Console integration"), - required_version='>=2.1.11') - --if IPYTHON_QT_INSTALLED: -- # Importing IPython will eventually set the QT_API environment variable -- import IPython # analysis:ignore -- if os.environ.get('QT_API', 'pyqt') == 'pyqt': -- # If PyQt is the selected GUI toolkit (at this stage, only the -- # bootstrap script has eventually set this option), switch to -- # PyQt API #2 by simply importing the IPython qt module -- os.environ['QT_API'] = 'pyqt' -- try: -- from IPython.external import qt #analysis:ignore -- except ImportError: -- # Avoid raising any error here: the spyderlib.requirements module -- # will take care of it, in a user-friendly way (Tkinter message box -- # if no GUI toolkit is installed) -- pass -- -- --#============================================================================== --# Check requirements --#============================================================================== --from spyderlib import requirements --requirements.check_path() --requirements.check_qt() -- -- - #============================================================================== - # Windows platforms only: support for hiding the attached console window - #============================================================================== -@@ -128,7 +111,7 @@ - #============================================================================== - # Create splash screen out of MainWindow to reduce perceived startup time. - #============================================================================== --from spyderlib.baseconfig import _, get_image_path -+from spyderlib.baseconfig import get_image_path - SPLASH = QSplashScreen(QPixmap(get_image_path('splash.png'), 'png')) - SPLASH_FONT = SPLASH.font() - SPLASH_FONT.setPixelSize(10) Deleted: python2.patch =================================================================== --- python2.patch 2015-09-06 16:28:36 UTC (rev 139265) +++ python2.patch 2015-09-06 16:28:52 UTC (rev 139266) @@ -1,39 +0,0 @@ -diff -Naur spyder-2.3.5.orig/spyderlib/userconfig.py spyder-2.3.5/spyderlib/userconfig.py ---- spyder-2.3.5.orig/spyderlib/userconfig.py 2015-06-22 16:47:56.000000000 +0200 -+++ spyder-2.3.5/spyderlib/userconfig.py 2015-07-12 15:17:03.639522116 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # -*- coding: utf-8 -*- - - # userconfig License Agreement (MIT License) -diff -Naur spyder-2.3.5.orig/spyderlib/utils/external/pickleshare.py spyder-2.3.5/spyderlib/utils/external/pickleshare.py ---- spyder-2.3.5.orig/spyderlib/utils/external/pickleshare.py 2015-06-22 16:47:56.000000000 +0200 -+++ spyder-2.3.5/spyderlib/utils/external/pickleshare.py 2015-07-12 15:17:18.216188678 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - """ PickleShare - a small 'shelve' like datastore with concurrency support - -diff -Naur spyder-2.3.5.orig/spyderplugins/widgets/pylintgui.py spyder-2.3.5/spyderplugins/widgets/pylintgui.py ---- spyder-2.3.5.orig/spyderplugins/widgets/pylintgui.py 2015-06-22 16:47:56.000000000 +0200 -+++ spyder-2.3.5/spyderplugins/widgets/pylintgui.py 2015-07-12 15:16:22.346189082 +0200 -@@ -40,7 +40,7 @@ - _ = get_translation("p_pylint", dirname="spyderplugins") - - --PYLINT = 'pylint' -+PYLINT = 'pylint2' - if PY3: - if programs.find_program('pylint3'): - PYLINT = 'pylint3' -@@ -61,7 +61,7 @@ - shell=True if os.name == 'nt' else False) - lines = to_unicode_from_fs(process.stdout.read()).splitlines() - if lines: -- regex = '({0}*|pylint-script.py) ([0-9\.]*)'.format(PYLINT) -+ regex = '({0}*|pylint2-script.py) ([0-9\.]*)'.format(PYLINT) - match = re.match(regex, lines[0]) - if match is not None: - return match.groups()[1] Copied: spyder/repos/community-any/python2.patch (from rev 139265, spyder/trunk/python2.patch) =================================================================== --- python2.patch (rev 0) +++ python2.patch 2015-09-06 16:28:52 UTC (rev 139266) @@ -0,0 +1,39 @@ +diff -Naur spyder-2.3.5.orig/spyderlib/userconfig.py spyder-2.3.5/spyderlib/userconfig.py +--- spyder-2.3.5.orig/spyderlib/userconfig.py 2015-06-22 16:47:56.000000000 +0200 ++++ spyder-2.3.5/spyderlib/userconfig.py 2015-07-12 15:17:03.639522116 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # -*- coding: utf-8 -*- + + # userconfig License Agreement (MIT License) +diff -Naur spyder-2.3.5.orig/spyderlib/utils/external/pickleshare.py spyder-2.3.5/spyderlib/utils/external/pickleshare.py +--- spyder-2.3.5.orig/spyderlib/utils/external/pickleshare.py 2015-06-22 16:47:56.000000000 +0200 ++++ spyder-2.3.5/spyderlib/utils/external/pickleshare.py 2015-07-12 15:17:18.216188678 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """ PickleShare - a small 'shelve' like datastore with concurrency support + +diff -Naur spyder-2.3.5.orig/spyderplugins/widgets/pylintgui.py spyder-2.3.5/spyderplugins/widgets/pylintgui.py +--- spyder-2.3.5.orig/spyderplugins/widgets/pylintgui.py 2015-06-22 16:47:56.000000000 +0200 ++++ spyder-2.3.5/spyderplugins/widgets/pylintgui.py 2015-07-12 15:16:22.346189082 +0200 +@@ -40,7 +40,7 @@ + _ = get_translation("p_pylint", dirname="spyderplugins") + + +-PYLINT = 'pylint' ++PYLINT = 'pylint2' + if PY3: + if programs.find_program('pylint3'): + PYLINT = 'pylint3' +@@ -61,7 +61,7 @@ + shell=True if os.name == 'nt' else False) + lines = to_unicode_from_fs(process.stdout.read()).splitlines() + if lines: +- regex = '({0}*|pylint-script.py) ([0-9\.]*)'.format(PYLINT) ++ regex = '({0}*|pylint2-script.py) ([0-9\.]*)'.format(PYLINT) + match = re.match(regex, lines[0]) + if match is not None: + return match.groups()[1] Deleted: spyder.install =================================================================== --- spyder.install 2015-09-06 16:28:36 UTC (rev 139265) +++ spyder.install 2015-09-06 16:28:52 UTC (rev 139266) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: spyder/repos/community-any/spyder.install (from rev 139265, spyder/trunk/spyder.install) =================================================================== --- spyder.install (rev 0) +++ spyder.install 2015-09-06 16:28:52 UTC (rev 139266) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}