Date: Saturday, January 28, 2017 @ 12:18:08 Author: muflone Revision: 209290
db-move: moved spyder from [community-testing] to [community] (any) Added: spyder/repos/community-any/PKGBUILD (from rev 209289, spyder/repos/community-testing-any/PKGBUILD) spyder/repos/community-any/python2-pep8.patch (from rev 209289, spyder/repos/community-testing-any/python2-pep8.patch) spyder/repos/community-any/python2.patch (from rev 209289, spyder/repos/community-testing-any/python2.patch) spyder/repos/community-any/python3-pep8.patch (from rev 209289, spyder/repos/community-testing-any/python3-pep8.patch) Deleted: spyder/repos/community-any/PKGBUILD spyder/repos/community-any/python2.patch spyder/repos/community-testing-any/ ----------------------------------+ /PKGBUILD | 79 +++++++++++++++++++++++++++++++++++++ /python2.patch | 29 +++++++++++++ community-any/PKGBUILD | 79 ------------------------------------- community-any/python2-pep8.patch | 45 +++++++++++++++++++++ community-any/python2.patch | 39 ------------------ community-any/python3-pep8.patch | 45 +++++++++++++++++++++ 6 files changed, 198 insertions(+), 118 deletions(-) Deleted: community-any/PKGBUILD =================================================================== --- community-any/PKGBUILD 2017-01-28 12:18:05 UTC (rev 209289) +++ community-any/PKGBUILD 2017-01-28 12:18:08 UTC (rev 209290) @@ -1,79 +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.9 -pkgrel=2 -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") -sha256sums=('8343147e98d3e6e93090cc51d0d4d03ea6f4d7e3a26defe37236eb3f36780868' - '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' - 'icu' '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' - 'icu' '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 209289, spyder/repos/community-testing-any/PKGBUILD) =================================================================== --- community-any/PKGBUILD (rev 0) +++ community-any/PKGBUILD 2017-01-28 12:18:08 UTC (rev 209290) @@ -0,0 +1,79 @@ +# $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=3.1.1 +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" + "python2-pep8.patch" + "python3-pep8.patch") +sha256sums=('491347da4675fc8f8107ddbc5a0cdf8d2d0a8be6fad0cbb308d747dc3fd36d57' + '4fb415fb358371da4a8b9524712de9338d391eed3bdabc5e217cf54f558771b5' + 'dbebf909bf59027d22247e3e3c1736b5ec9337a879358f8117a967bb03e913b2' + 'f4eba4c414e655f0f2797e9864aa199607a6706f6b245aca56a54b250febc382') + +package_spyder() { + 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' + 'ipython2-notebook' + 'python2-rope' 'python2-jedi' 'python2-pylint' 'python2-pycodestyle' 'python2-sphinx' + 'icu' 'gtk-update-icon-cache') + 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') + [ -d "build" ] && rm -rf "build" + cp -r "${pkgbase}-${pkgver}" build + cd build + patch -p1 -i "../python2.patch" + patch -p1 -i "../python2-pep8.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 "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" +} + +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') + [ -d "build" ] && rm -rf "build" + cp -r "${pkgbase}-${pkgver}" build + cd build + patch -p1 -i "../python3-pep8.patch" + 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 "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" +} Copied: spyder/repos/community-any/python2-pep8.patch (from rev 209289, spyder/repos/community-testing-any/python2-pep8.patch) =================================================================== --- community-any/python2-pep8.patch (rev 0) +++ community-any/python2-pep8.patch 2017-01-28 12:18:08 UTC (rev 209290) @@ -0,0 +1,45 @@ +diff -Naur spyder-3.1.1.orig/spyder/plugins/editor.py spyder-3.1.1.pep8-python2/spyder/plugins/editor.py +--- spyder-3.1.1.orig/spyder/plugins/editor.py 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1.pep8-python2/spyder/plugins/editor.py 2017-01-22 23:40:42.426230374 +0100 +@@ -225,7 +225,7 @@ + pep8_label = QLabel(_("<i>(Refer to the {} page)</i>").format(pep_url)) + pep8_label.setOpenExternalLinks(True) + is_pyflakes = codeanalysis.is_pyflakes_installed() +- is_pep8 = codeanalysis.get_checker_executable('pep8') is not None ++ is_pep8 = codeanalysis.get_checker_executable('pycodestyle') is not None + pyflakes_box = newcb(_("Real-time code analysis"), + 'code_analysis/pyflakes', default=True, + tip=_("<p>If enabled, Python source code will be analyzed " +diff -Naur spyder-3.1.1.orig/spyder/utils/codeanalysis.py spyder-3.1.1.pep8-python2/spyder/utils/codeanalysis.py +--- spyder-3.1.1.orig/spyder/utils/codeanalysis.py 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1.pep8-python2/spyder/utils/codeanalysis.py 2017-01-22 23:44:40.107465175 +0100 +@@ -92,7 +92,7 @@ + required_version=PYFLAKES_REQVER) + + PEP8_REQVER = '>=0.6' +-dependencies.add("pep8", _("Real-time code style analysis on the Editor"), ++dependencies.add("pycodestyle", _("Real-time code style analysis on the Editor"), + required_version=PEP8_REQVER) + + +@@ -167,7 +167,7 @@ + def check_with_pep8(source_code, filename=None): + """Check source code with pep8""" + try: +- args = get_checker_executable('pep8') ++ args = get_checker_executable('pycodestyle2') + results = check(args, source_code, filename=filename, options=['-r']) + except Exception: + # Never return None to avoid lock in spyder/widgets/editor.py +diff -Naur spyder-3.1.1.orig/spyder/widgets/editor.py spyder-3.1.1.pep8-python2/spyder/widgets/editor.py +--- spyder-3.1.1.orig/spyder/widgets/editor.py 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1.pep8-python2/spyder/widgets/editor.py 2017-01-22 23:45:29.697031996 +0100 +@@ -199,7 +199,7 @@ + """Run code analysis""" + run_pyflakes = run_pyflakes and codeanalysis.is_pyflakes_installed() + run_pep8 = run_pep8 and\ +- codeanalysis.get_checker_executable('pep8') is not None ++ codeanalysis.get_checker_executable('pycodestyle') is not None + self.pyflakes_results = [] + self.pep8_results = [] + if self.editor.is_python(): Deleted: community-any/python2.patch =================================================================== --- community-any/python2.patch 2017-01-28 12:18:05 UTC (rev 209289) +++ community-any/python2.patch 2017-01-28 12:18:08 UTC (rev 209290) @@ -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 209289, spyder/repos/community-testing-any/python2.patch) =================================================================== --- community-any/python2.patch (rev 0) +++ community-any/python2.patch 2017-01-28 12:18:08 UTC (rev 209290) @@ -0,0 +1,29 @@ +diff -Naur spyder-3.1.1.orig/scripts/spyder spyder-3.1.1/scripts/spyder +--- spyder-3.1.1.orig/scripts/spyder 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1/scripts/spyder 2017-01-22 19:01:59.364263881 +0100 +@@ -1,3 +1,3 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + from spyder.app import start + start.main() +diff -Naur spyder-3.1.1.orig/spyder/app/restart.py spyder-3.1.1/spyder/app/restart.py +--- spyder-3.1.1.orig/spyder/app/restart.py 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1/spyder/app/restart.py 2017-01-22 19:00:54.574451747 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # -*- coding: utf-8 -*- + # + # Copyright © Spyder Project Contributors +diff -Naur spyder-3.1.1.orig/spyder_pylint/widgets/pylintgui.py spyder-3.1.1/spyder_pylint/widgets/pylintgui.py +--- spyder-3.1.1.orig/spyder_pylint/widgets/pylintgui.py 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1/spyder_pylint/widgets/pylintgui.py 2017-01-22 19:05:13.522630971 +0100 +@@ -47,7 +47,7 @@ + _ = gettext.gettext + + +-PYLINT = 'pylint' ++PYLINT = 'pylint2' + if PY3: + if programs.find_program('pylint3'): + PYLINT = 'pylint3' Copied: spyder/repos/community-any/python3-pep8.patch (from rev 209289, spyder/repos/community-testing-any/python3-pep8.patch) =================================================================== --- community-any/python3-pep8.patch (rev 0) +++ community-any/python3-pep8.patch 2017-01-28 12:18:08 UTC (rev 209290) @@ -0,0 +1,45 @@ +diff -Naur spyder-3.1.1.orig/spyder/plugins/editor.py spyder-3.1.1.pep8-python3/spyder/plugins/editor.py +--- spyder-3.1.1.orig/spyder/plugins/editor.py 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1.pep8-python3/spyder/plugins/editor.py 2017-01-22 23:49:13.015095511 +0100 +@@ -225,7 +225,7 @@ + pep8_label = QLabel(_("<i>(Refer to the {} page)</i>").format(pep_url)) + pep8_label.setOpenExternalLinks(True) + is_pyflakes = codeanalysis.is_pyflakes_installed() +- is_pep8 = codeanalysis.get_checker_executable('pep8') is not None ++ is_pep8 = codeanalysis.get_checker_executable('pycodestyle') is not None + pyflakes_box = newcb(_("Real-time code analysis"), + 'code_analysis/pyflakes', default=True, + tip=_("<p>If enabled, Python source code will be analyzed " +diff -Naur spyder-3.1.1.orig/spyder/utils/codeanalysis.py spyder-3.1.1.pep8-python3/spyder/utils/codeanalysis.py +--- spyder-3.1.1.orig/spyder/utils/codeanalysis.py 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1.pep8-python3/spyder/utils/codeanalysis.py 2017-01-22 23:49:56.851384285 +0100 +@@ -92,7 +92,7 @@ + required_version=PYFLAKES_REQVER) + + PEP8_REQVER = '>=0.6' +-dependencies.add("pep8", _("Real-time code style analysis on the Editor"), ++dependencies.add("pycodestyle", _("Real-time code style analysis on the Editor"), + required_version=PEP8_REQVER) + + +@@ -167,7 +167,7 @@ + def check_with_pep8(source_code, filename=None): + """Check source code with pep8""" + try: +- args = get_checker_executable('pep8') ++ args = get_checker_executable('pycodestyle') + results = check(args, source_code, filename=filename, options=['-r']) + except Exception: + # Never return None to avoid lock in spyder/widgets/editor.py +diff -Naur spyder-3.1.1.orig/spyder/widgets/editor.py spyder-3.1.1.pep8-python3/spyder/widgets/editor.py +--- spyder-3.1.1.orig/spyder/widgets/editor.py 2017-01-22 18:28:03.000000000 +0100 ++++ spyder-3.1.1.pep8-python3/spyder/widgets/editor.py 2017-01-22 23:50:13.531240654 +0100 +@@ -199,7 +199,7 @@ + """Run code analysis""" + run_pyflakes = run_pyflakes and codeanalysis.is_pyflakes_installed() + run_pep8 = run_pep8 and\ +- codeanalysis.get_checker_executable('pep8') is not None ++ codeanalysis.get_checker_executable('pycodestyle') is not None + self.pyflakes_results = [] + self.pep8_results = [] + if self.editor.is_python():