[arch-commits] Commit in sagemath/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Tuesday, May 11, 2021 @ 16:22:12
  Author: arojas
Revision: 930240

make python-ipywidgets a dependency of the main package (FS#70798), merge the jupyter notebook since it has almost no additional dependencies now

Modified:
  sagemath/trunk/PKGBUILD

----------+
 PKGBUILD |   34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-11 16:12:45 UTC (rev 930239)
+++ PKGBUILD	2021-05-11 16:22:12 UTC (rev 930240)
@@ -5,21 +5,21 @@
 # Contributor: Osman Ugus <ugus11 at yahoo dot com>
 # Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
 
-pkgbase=sagemath
-pkgname=(sagemath sagemath-jupyter)
+pkgname=sagemath
 pkgver=9.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
 arch=(x86_64)
 url='http://www.sagemath.org'
 license=(GPL)
 depends=(ipython palp brial cliquer maxima-ecl gfan sympow nauty python-rpy2 python-fpylll python-psutil python-cypari2
-  python-matplotlib python-scipy python-sympy python-networkx python-pillow python-pplpy python-sphinx
+  python-matplotlib python-scipy python-sympy python-networkx python-pillow python-pplpy python-sphinx python-ipywidgets
   gap flintqs lcalc lrcalc arb eclib zn_poly gd python-cvxopt pynac linbox m4rie pari-galdata pari-seadata-small planarity rankwidth tachyon
   sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials
   iml giac libhomfly libbraiding symmetrica threejs-sage)
 optdepends=('cython: to compile cython code' 'python-pkgconfig: to compile cython code'
-  'jmol: alternative 3D plot engine' 'sagemath-doc: HTML documentation' 'python-igraph: igraph backend for graph theory'
+  'jmol: alternative 3D plot engine' 'jupyter-jsmol: alternative 3D plot engine in the Jupyter notebook'
+  'sagemath-doc: HTML documentation' 'python-igraph: igraph backend for graph theory'
   'sage-numerical-backends-coin: COIN mixed integer linear programming backend'
   'coin-or-csdp: for computing Lovász theta-function of graphs'
   'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids'
@@ -32,8 +32,10 @@
   'shared_meataxe: faster matrix arithmetic over finite fields' 'openblas: faster linear algebra'
   'sirocco: for computing the fundamental group of the complement of a plane curve' 'primecount: faster prime_pi implementation'
   'dot2tex: for displaying some diagrams' 'cryptominisat5: SAT solver' 'python-pycosat: picosat SAT solver'
-  'python-pip: to install optional packages with sage -pip')
-makedepends=(cython boost ratpoints python-jinja sirocco mcqd coxeter bliss tdlib python-pkgconfig shared_meataxe primecount git)
+  'python-pip: to install optional packages with sage -pip' 'sage-notebook-exporter: convert flask notebooks to Jupyter')
+makedepends=(cython boost ratpoints python-jinja sirocco mcqd coxeter bliss tdlib python-pkgconfig shared_meataxe primecount)
+conflicts=(sagemath-jupyter)
+replaces=(sagemath-jupyter)
 source=(https://github.com/sagemath/sage/archive/$pkgver/$pkgname-$pkgver.tar.gz
         sagemath-optional-packages.patch
         latte-count.patch
@@ -80,9 +82,7 @@
   python setup.py build
 }
 
-package_sagemath() {
-  optdepends+=('sagemath-jupyter: Jupyter kernel')
-
+package() {
   cd sage-$pkgver/build/pkgs/sagelib/src
 
   python setup.py install --root="$pkgdir" --optimize=1
@@ -90,21 +90,9 @@
 # Remove sage_setup
   rm -r "$pkgdir"/usr/lib/python*/site-packages/sage_setup
 
-# Split jupyter kernel
-  rm -r "$pkgdir"/usr/share
-}
-
-package_sagemath-jupyter() {
-  pkgdesc='Jupyter kernel for SageMath'
-  depends=(sagemath python-jupyter_client python-ipywidgets jupyter-jsmol)
-  optdepends=('sage-notebook-exporter: convert flask notebooks to Jupyter')
-
-  cd sage-$pkgver/src
-
-  python -c "from sage.repl.ipython_kernel.install import SageKernelSpec; SageKernelSpec.update(prefix='$pkgdir/usr')"
 # fix symlinks to assets
   _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
-  for _i in $(ls sage/ext_data/notebook-ipython); do
+  for _i in $(ls "$srcdir"/sage-$pkgver/src/sage/ext_data/notebook-ipython); do
     rm "$pkgdir"/usr/share/jupyter/kernels/sagemath/$_i
     ln -s $_pythonpath/sage/ext_data/notebook-ipython/$_i "$pkgdir"/usr/share/jupyter/kernels/sagemath/
   done