[arch-commits] Commit in spyder/trunk (2 files)
Fabio Castelli
muflone at archlinux.org
Sat Aug 22 18:52:13 UTC 2015
Date: Saturday, August 22, 2015 @ 20:52:12
Author: muflone
Revision: 138641
upgpkg: spyder 2.3.5.2-2
Added:
spyder/trunk/f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch
Modified:
spyder/trunk/PKGBUILD
------------------------------------------------+
PKGBUILD | 17 +--
f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch | 116 +++++++++++++++++++++++
2 files changed, 126 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-08-22 12:59:54 UTC (rev 138640)
+++ PKGBUILD 2015-08-22 18:52:12 UTC (rev 138641)
@@ -6,7 +6,7 @@
pkgbase='spyder'
pkgname=('spyder' 'spyder3')
pkgver=2.3.5.2
-pkgrel=1
+pkgrel=2
pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.'
makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx')
arch=('any')
@@ -14,15 +14,17 @@
license=('MIT')
install="${pkgbase}.install"
source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgbase}/archive/v${pkgver}.tar.gz"
- "python2.patch")
+ "python2.patch"
+ "f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch")
sha256sums=('fb7deef6d684c6dd6cce645e4589d5af70e4ef947277bf2ad70d50b9020dffd1'
- '58a30ff9401c528176690f2081aed2fe3185c5baaf54ee6a1c127e9421bab96a')
+ '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' 'gtk-update-icon-cache')
+ depends=('python2-pyqt4' 'python2-pyflakes' 'python2-pyzmq' 'python2-pygments' 'ipython2-notebook'
+ 'gtk-update-icon-cache')
optdepends=('python2-pylint: powerful code analysis'
- 'ipython2: enhanced Python interpreter'
'python2-rope: editor code completion, calltips and go-to-definition'
'python2-sphinx: rich text help on the object inspector'
'python2-numpy: N-dimensional arrays'
@@ -38,6 +40,7 @@
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
@@ -51,9 +54,9 @@
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' 'gtk-update-icon-cache')
+ depends=('python-pyqt4' 'python-pyflakes' 'python-pyzmq' 'python-pygments' 'jupyter'
+ 'gtk-update-icon-cache')
optdepends=('python-pylint: powerful code analysis'
- 'ipython: enhanced Python interpreter'
'python-rope: editor code completion, calltips and go-to-definition'
'python-sphinx: rich text help on the object inspector'
'python-numpy: N-dimensional arrays'
Added: f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch
===================================================================
--- f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch (rev 0)
+++ f5ee45690f970a189d102cfbbe8820ccc6fc95fc.patch 2015-08-22 18:52:12 UTC (rev 138641)
@@ -0,0 +1,116 @@
+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)
More information about the arch-commits
mailing list