[arch-commits] Commit in spyder/trunk (PKGBUILD python2-optional-nbconvert.patch)

[Fabio Castelli]

    Date: Sunday, May 7, 2017 @ 00:56:46
  Author: muflone
Revision: 227230

upgpkg: spyder 3.1.4-1

Added:
  spyder/trunk/python2-optional-nbconvert.patch
Modified:
  spyder/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |    8 +++++---
 python2-optional-nbconvert.patch |   12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-06 22:43:54 UTC (rev 227229)
+++ PKGBUILD	2017-05-07 00:56:46 UTC (rev 227230)
@@ -5,7 +5,7 @@
 
 pkgbase='spyder'
 pkgname=('spyder' 'spyder3')
-pkgver=3.1.3
+pkgver=3.1.4
 pkgrel=1
 pkgdesc='Scientific PYthon Development EnviRonment providing MATLAB-like features.'
 makedepends=('python2-setuptools' 'python-setuptools' 'python-sphinx' 'python2-sphinx')
@@ -14,10 +14,12 @@
 license=('MIT')
 source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/spyder-ide/${pkgbase}/archive/v${pkgver}.tar.gz"
         "python2.patch"
+        "python2-optional-nbconvert.patch"
         "python2-pep8.patch"
         "python3-pep8.patch")
-sha256sums=('b8d4a8bd6793242be9c5cc6a9f6fd8c4f47f08be4689df15fc2680899ffbf2c3'
+sha256sums=('bcd75ebe65309a5f9184eedc59c415fe0d09e9b54a2b51bc31199a6095cd0b85'
             '4fb415fb358371da4a8b9524712de9338d391eed3bdabc5e217cf54f558771b5'
+            'f6afdd08971a2022649af0be70cac67aa4d95fff06ade57f708693cffe073528'
             'dbebf909bf59027d22247e3e3c1736b5ec9337a879358f8117a967bb03e913b2'
             'f4eba4c414e655f0f2797e9864aa199607a6706f6b245aca56a54b250febc382')
 
@@ -25,7 +27,6 @@
   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'
@@ -39,6 +40,7 @@
   cd build
   patch -p1 -i "../python2.patch"
   patch -p1 -i "../python2-pep8.patch"
+  patch -p1 -i "../python2-optional-nbconvert.patch"
   python2 setup.py build
   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
   # Install license file

Added: python2-optional-nbconvert.patch
===================================================================
--- python2-optional-nbconvert.patch	                        (rev 0)
+++ python2-optional-nbconvert.patch	2017-05-07 00:56:46 UTC (rev 227230)
@@ -0,0 +1,12 @@
+diff -Naur spyder-3.1.4.orig/spyder/config/ipython.py spyder-3.1.4/spyder/config/ipython.py
+--- spyder-3.1.4.orig/spyder/config/ipython.py	2017-04-24 02:30:23.000000000 +0200
++++ spyder-3.1.4/spyder/config/ipython.py	2017-05-07 02:50:25.640734369 +0200
+@@ -23,7 +23,7 @@
+ dependencies.add("qtconsole", _("Integrate the IPython console"),
+                  required_version=QTCONSOLE_REQVER)
+ dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"),
+-                 required_version=NBCONVERT_REQVER)
++                 required_version=NBCONVERT_REQVER, optional=True)
+ 
+ 
+ # Auxiliary functions