summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Rojas2019-08-26 06:25:55 +0000
committerAntonio Rojas2019-08-26 06:25:55 +0000
commitd08962ad1bdcae055338b6591ccae5d86c6fd007 (patch)
treef49a826f4a6bf37c27aed89b98539fde1cea9acb
parent1e7df0a4034bf1c885a5ff3c71a42aa08c3eb10b (diff)
downloadaur-d08962ad1bdcae055338b6591ccae5d86c6fd007.tar.gz
Rebase patches
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--sagemath-cremona.patch8
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dfe9f7247ab3..0c4bb045e3ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sagemath-git
pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab
- pkgver = 8.9.beta5.r0.gac8cf16c5c
+ pkgver = 8.9.beta8.r0.g4583b4056e
pkgrel = 1
url = http://www.sagemath.org
arch = x86_64
@@ -110,7 +110,7 @@ pkgbase = sagemath-git
sha256sums = e554cdf689100c787a5fbcb7fe281cd68bef081e08bd58df8be1d113a4665d7e
sha256sums = 1f2a34e15bf732ec8687c467a52e897615505dc3ddd792d811e8b6a7e19f1517
sha256sums = 7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94
- sha256sums = 4c6df9e4e5a7b29ecf6189eda3e5a79f69b6e1b4d29c1b9559663149b8c0af96
+ sha256sums = 5281e5c715ff14ffa4003f643a508863ca58efb9e083cece81928f78810dc525
sha256sums = 961bfb5694b67d425d21240d71490cb71714b5207c23448c89be0966512ff8f9
sha256sums = a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938
diff --git a/PKGBUILD b/PKGBUILD
index de218f78567e..0015f402493a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=sagemath-git
pkgname=(sagemath-git sagemath-jupyter-git)
-pkgver=8.9.beta5.r0.gac8cf16c5c
+pkgver=8.9.beta8.r0.g4583b4056e
pkgrel=1
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
arch=(x86_64)
@@ -49,7 +49,7 @@ sha256sums=('SKIP'
'e554cdf689100c787a5fbcb7fe281cd68bef081e08bd58df8be1d113a4665d7e'
'1f2a34e15bf732ec8687c467a52e897615505dc3ddd792d811e8b6a7e19f1517'
'7fcb52e96935dccb0f958d37c2f4e3918392480b9af53e08562f6cba6c68cb94'
- '4c6df9e4e5a7b29ecf6189eda3e5a79f69b6e1b4d29c1b9559663149b8c0af96'
+ '5281e5c715ff14ffa4003f643a508863ca58efb9e083cece81928f78810dc525'
'961bfb5694b67d425d21240d71490cb71714b5207c23448c89be0966512ff8f9'
'a42f3b152b1aedb8abf16bc70971419919d1fe30328574e7fef8305f9d07d938')
diff --git a/sagemath-cremona.patch b/sagemath-cremona.patch
index b7ad86ffabd5..7765a14b5079 100644
--- a/sagemath-cremona.patch
+++ b/sagemath-cremona.patch
@@ -2,16 +2,16 @@ diff --git a/src/sage/databases/cremona.py b/src/sage/databases/cremona.py
index 3f8dd62..ed5726a 100644
--- a/src/sage/databases/cremona.py
+++ b/src/sage/databases/cremona.py
-@@ -53,7 +53,7 @@ from sage.misc.prandom import randint
+@@ -51,7 +51,7 @@ from sage.misc.prandom import randint
import sage.schemes.elliptic_curves.constructor as elliptic
from .sql_db import SQLDatabase, verify_column
-from sage.misc.package import is_package_installed
+from sage.features.databases import DatabaseCremona
- from sage.env import CREMONA_MINI_DATA_DIR, CREMONA_LARGE_DATA_DIR
+ from sage.env import CREMONA_MINI_DATA_DIR, CREMONA_LARGE_DATA_DIR, SAGE_SHARE
from sage.misc.all import walltime
-@@ -835,7 +835,7 @@ class MiniCremonaDatabase(SQLDatabase):
+@@ -843,7 +843,7 @@ class MiniCremonaDatabase(SQLDatabase):
if N < self.largest_conductor():
message = "There is no elliptic curve with label " + label \
+ " in the database"
@@ -20,7 +20,7 @@ index 3f8dd62..ed5726a 100644
message = "There is no elliptic curve with label " + label \
+ " in the currently available databases"
else:
-@@ -1683,7 +1683,7 @@ def CremonaDatabase(name=None,mini=None,set_global=None):
+@@ -1695,7 +1695,7 @@ def CremonaDatabase(name=None,mini=None,set_global=None):
if name is None and not set_global:
return _db
if set_global and name is None: