[arch-commits] Commit in spyder/trunk (PKGBUILD pylint2.patch python2.patch)
Fabio Castelli
muflone at archlinux.org
Sun Jul 12 13:58:34 UTC 2015
Date: Sunday, July 12, 2015 @ 15:58:34
Author: muflone
Revision: 136719
upgpkg: spyder 2.3.5-1
Modified:
spyder/trunk/PKGBUILD
spyder/trunk/python2.patch
Deleted:
spyder/trunk/pylint2.patch
---------------+
PKGBUILD | 19 ++++++++++---------
pylint2.patch | 28 ----------------------------
python2.patch | 33 +++++++++++++++++++++++++++------
3 files changed, 37 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-07-12 11:30:20 UTC (rev 136718)
+++ PKGBUILD 2015-07-12 13:58:34 UTC (rev 136719)
@@ -5,7 +5,7 @@
pkgbase='spyder'
pkgname=('spyder' 'spyder3')
-pkgver=2.3.4
+pkgver=2.3.5
pkgrel=1
pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.'
makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx')
@@ -13,12 +13,10 @@
url='http://code.google.com/p/spyderlib/'
license=('MIT')
install="${pkgbase}.install"
-source=("https://bitbucket.org/spyder-ide/spyderlib/downloads/${pkgbase}-${pkgver}.zip"
- "pylint2.patch"
+source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgbase}/archive/v${pkgver}.tar.gz"
"python2.patch")
-sha256sums=('da4b13d6faed3e8810c0418f8274b26fde4f265ea4f93bee154af128a755c184'
- 'f8836efa74ac9b8fce389a2708bb253083bbe042aabec124659839d5b3e167dd'
- '05f194438176cfa03cb76f38e5f64723b72a39d6771d5d4a927adf07a0ec67f1')
+sha256sums=('d610554bc4e5531ae600a4a8aa4ba680be26429c8a9cf98f8c53862c5fc7e381'
+ '58a30ff9401c528176690f2081aed2fe3185c5baaf54ee6a1c127e9421bab96a')
package_spyder() {
pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features for Python 2.x series.'
@@ -33,12 +31,13 @@
'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-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 "../pylint2.patch"
python2 setup.py build
python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
# Install license file
@@ -63,7 +62,9 @@
'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-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
Deleted: pylint2.patch
===================================================================
--- pylint2.patch 2015-07-12 11:30:20 UTC (rev 136718)
+++ pylint2.patch 2015-07-12 13:58:34 UTC (rev 136719)
@@ -1,28 +0,0 @@
-diff -Naur spyder-2.3.0/spyderplugins/widgets/pylintgui.py spyder-2.3.0-patched/spyderplugins/widgets/pylintgui.py
---- spyder-2.3.0/spyderplugins/widgets/pylintgui.py 2014-07-10 08:06:40.000000000 +0200
-+++ spyder-2.3.0-patched/spyderplugins/widgets/pylintgui.py 2014-08-08 12:26:07.164971831 +0200
-@@ -40,7 +40,7 @@
- _ = get_translation("p_pylint", dirname="spyderplugins")
-
-
--PYLINT_PATH = programs.find_program('pylint')
-+PYLINT_PATH = programs.find_program('pylint2')
-
-
- def get_pylint_version():
-@@ -48,13 +48,13 @@
- global PYLINT_PATH
- if PYLINT_PATH is None:
- return
-- process = subprocess.Popen(['pylint', '--version'],
-+ process = subprocess.Popen(['pylint2', '--version'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- cwd=osp.dirname(PYLINT_PATH),
- shell=True if os.name == 'nt' else False)
- lines = to_unicode_from_fs(process.stdout.read()).splitlines()
- if lines:
-- match = re.match('(pylint|pylint-script.py) ([0-9\.]*)', lines[0])
-+ match = re.match('(pylint2|pylint2-script.py) ([0-9\.]*)', lines[0])
- if match is not None:
- return match.groups()[1]
-
Modified: python2.patch
===================================================================
--- python2.patch 2015-07-12 11:30:20 UTC (rev 136718)
+++ python2.patch 2015-07-12 13:58:34 UTC (rev 136719)
@@ -1,6 +1,6 @@
-diff -Naur spyder-2.3.0/spyderlib/userconfig.py spyder-2.3.0-patched/spyderlib/userconfig.py
---- spyder-2.3.0/spyderlib/userconfig.py 2014-07-10 08:06:40.000000000 +0200
-+++ spyder-2.3.0-patched/spyderlib/userconfig.py 2014-08-08 12:30:53.544984165 +0200
+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
@@ -7,9 +7,9 @@
# -*- coding: utf-8 -*-
# userconfig License Agreement (MIT License)
-diff -Naur spyder-2.3.0/spyderlib/utils/external/pickleshare.py spyder-2.3.0-patched/spyderlib/utils/external/pickleshare.py
---- spyder-2.3.0/spyderlib/utils/external/pickleshare.py 2014-07-10 08:06:40.000000000 +0200
-+++ spyder-2.3.0-patched/spyderlib/utils/external/pickleshare.py 2014-08-08 12:31:00.181651117 +0200
+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
@@ -16,3 +16,24 @@
""" 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]
More information about the arch-commits
mailing list