[arch-commits] Commit in sage-data-conway_polynomials/trunk (PKGBUILD spkg-install)

[Antonio Rojas]

    Date: Friday, July 21, 2017 @ 23:57:21
  Author: arojas
Revision: 245953

Use new format required by Sagemath 8.0

Modified:
  sage-data-conway_polynomials/trunk/PKGBUILD
  sage-data-conway_polynomials/trunk/spkg-install

--------------+
 PKGBUILD     |   14 ++++++--------
 spkg-install |   12 +++++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-21 23:55:10 UTC (rev 245952)
+++ PKGBUILD	2017-07-21 23:57:21 UTC (rev 245953)
@@ -4,22 +4,20 @@
 _dbname=conway_polynomials
 pkgname=sage-data-$_dbname
 pkgver=0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A small database of Conway polynomials"
 arch=(any)
 url="http://www.sagemath.org"
 license=(GPL)
 depends=()
-makedepends=(sagemath)
+makedepends=(python2-six)
 source=("http://mirrors.mit.edu/sage/spkg/upstream/conway_polynomials/$_dbname-$pkgver.tar.bz2" 'spkg-install')
-md5sums=('a2725ba21f44554196781424d957f68a'
-         '5b3b2fc90d2d639f1a44b621d7848b4d')
+sha256sums=('d8f2788a85b1c2482cc4abe1a35d3da777445e21ec49b031d36b899e3c0deb17'
+            '02a93174df87f7afe55a7720571e04df3471bd7dad197017b16bc83396b32254')
 
 package() {
-  export PYTHONPATH="$PWD:/usr/lib/sage/site-packages:/usr/bin"
-  export SAGE_LOCAL="/usr"
-  export SAGE_SHARE="$pkgdir/usr/share"
-
+  export SAGE_SHARE="$pkgdir"/usr/share
+  export PYTHONPATH=$PWD
   ln -s conway_polynomials-$pkgver src
   python2 spkg-install
 }

Modified: spkg-install
===================================================================
--- spkg-install	2017-07-21 23:55:10 UTC (rev 245952)
+++ spkg-install	2017-07-21 23:57:21 UTC (rev 245953)
@@ -1,22 +1,20 @@
-#!/usr/bin/env python2
-
 import os
-from sage.all import save
-from sage.env import SAGE_SHARE
+from six.moves import cPickle as pickle
 
+SAGE_SHARE = os.getenv('SAGE_SHARE')
 install_root = os.path.join(SAGE_SHARE, 'conway_polynomials')
 
 def create_db():
     db = {}
     from src import conway_polynomials
-    for p,n,v in conway_polynomials:
+    for p, n, v in conway_polynomials:
         if not p in db:
             db[p] = {}
         db[p][n] = v
     if not os.path.exists(install_root):
         os.makedirs(install_root)
-    save(db, os.path.join(install_root, 'conway_polynomials.sobj'))
+    with open(os.path.join(install_root, 'conway_polynomials.p'), 'wb') as f:
+        pickle.dump(db, f)
 
 if __name__ == '__main__':
     create_db()
-