[arch-commits] Commit in sagemath/trunk (PKGBUILD c_lib.patch ipython-4.patch)

[Antonio Rojas]

    Date: Saturday, August 22, 2015 @ 12:48:42
  Author: arojas
Revision: 138632

Fix more IPython 4 deprecation warnings

Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/ipython-4.patch
Deleted:
  sagemath/trunk/c_lib.patch

-----------------+
 PKGBUILD        |    4 ++--
 c_lib.patch     |   17 -----------------
 ipython-4.patch |   22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-22 10:17:57 UTC (rev 138631)
+++ PKGBUILD	2015-08-22 10:48:42 UTC (rev 138632)
@@ -19,7 +19,7 @@
   eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox gsl rubiks pari-galdata pari-seadata-small planarity rankwidth
   sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials)
 optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface'
-  'sagemath-doc: Documentation and inline help' 'ipython2-notebook: IPython notebook interface' 'mathjax: IPython notebook interface'
+  'sagemath-doc: Documentation and inline help' 'ipython2-notebook: Jupyter notebook interface' 'mathjax: Jupyter notebook interface'
   'coin-or-cbc: COIN backend for numerical computations' 'nauty: for generating some classes of graphs'
   'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids'
   'modular_decomposition: modular decomposition of graphs'
@@ -48,7 +48,7 @@
          'f333939ea6c41377b66407c81016cee4'
          '4eb23a3c7363258bc9ba764d6e5512ba'
          '1b8dfa047115180aa0afbeaf19d97762'
-         'b21a2b0e4cb805bf61a5060c3ed97cb3')
+         '41aa997ad9f00afdc3357b37fc70f0e6')
 
 prepare(){
   cd sage-$pkgver

Deleted: c_lib.patch
===================================================================
--- c_lib.patch	2015-08-22 10:17:57 UTC (rev 138631)
+++ c_lib.patch	2015-08-22 10:48:42 UTC (rev 138632)
@@ -1,17 +0,0 @@
---- src/setup.py.orig	2014-11-01 23:49:10.000000000 +0100
-+++ src/setup.py	2014-11-07 00:40:58.414838636 +0100
-@@ -171,10 +171,12 @@
-     m.libraries = ['csage'] + m.libraries
-     if m.language == 'c++':
-         m.libraries.append('stdc++')
-+        m.libraries.append('ntl')
-+    m.libraries = m.libraries + ['gmp', 'm', 'dl']
- 
-     m.extra_compile_args = m.extra_compile_args + extra_compile_args
-     m.extra_link_args = m.extra_link_args + extra_link_args
--    m.library_dirs = m.library_dirs + [os.path.join(SAGE_LOCAL, "lib")]
-+    m.library_dirs += ['c_lib', '%s/lib' % SAGE_LOCAL]
-     m.include_dirs = m.include_dirs + include_dirs
-
- 
- 

Modified: ipython-4.patch
===================================================================
--- ipython-4.patch	2015-08-22 10:17:57 UTC (rev 138631)
+++ ipython-4.patch	2015-08-22 10:48:42 UTC (rev 138632)
@@ -11,3 +11,25 @@
  
  from sage.env import SAGE_LOCAL
  
+--- src/sage/repl/ipython_kernel/__main__.py.orig  2015-08-22 12:32:58.595605714 +0200
++++ src/sage/repl/ipython_kernel/__main__.py       2015-08-22 12:33:36.065900491 +0200
+@@ -1,3 +1,3 @@
+-from IPython.kernel.zmq.kernelapp import IPKernelApp
++from ipykernel.kernelapp import IPKernelApp
+ from sage.repl.ipython_kernel.kernel import SageKernel
+ IPKernelApp.launch_instance(kernel_class=SageKernel)
+--- src/sage/repl/ipython_kernel/kernel.py.orig    2015-08-22 12:35:08.709928354 +0200
++++ src/sage/repl/ipython_kernel/kernel.py 2015-08-22 12:35:31.983429208 +0200
+@@ -15,9 +15,9 @@
+ #*****************************************************************************
+ 
+ import sys
+-from IPython.kernel.zmq.ipkernel import IPythonKernel
+-from IPython.kernel.zmq.zmqshell import ZMQInteractiveShell
+-from IPython.utils.traitlets import Type
++from ipykernel.ipkernel import IPythonKernel
++from ipykernel.zmqshell import ZMQInteractiveShell
++from traitlets import Type
+ 
+ from sage.env import SAGE_VERSION, SAGE_EXTCODE, SAGE_DOC
+ from sage.repl.interpreter import SageNotebookInteractiveShell