- Improve the -ecm patch.
- Add -formatargspec patch to silence doc-building warnings.
- Add -data-elliptic_curves_large subpackage.
- Build with bliss, coxeter3, and mcqd support.
- Fix typo that made the singular.hlp file inaccessible.
- Add more gap packages to get closer to the set shipped by upstream.
- Refactor Requires so they apply to the correct subpackages.
- More python 3 patching due to changes in python 3.8.
- Use upstream's method of installing jupyter support.
- Obsolete the sagemath-notebook-export subpackage.
This commit is contained in:
Jerry James 2019-09-12 20:34:03 -06:00
parent e4003eb1b4
commit ecae6482c5
12 changed files with 723 additions and 176 deletions

View file

@ -1,43 +1,21 @@
diff -up src/sage/databases/cremona.py.orig src/sage/databases/cremona.py
--- src/sage/databases/cremona.py.orig 2018-12-22 16:37:08.000000000 -0700
+++ src/sage/databases/cremona.py 2019-01-04 10:29:55.578694061 -0700
@@ -53,7 +53,6 @@ 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.env import CREMONA_MINI_DATA_DIR, CREMONA_LARGE_DATA_DIR
from sage.misc.all import walltime
@@ -835,14 +834,6 @@ class MiniCremonaDatabase(SQLDatabase):
if N < self.largest_conductor():
message = "There is no elliptic curve with label " + label \
+ " in the database"
- elif is_package_installed('database_cremona_ellcurve'):
- message = "There is no elliptic curve with label " + label \
- + " in the currently available databases"
- else:
- message = "There is no elliptic curve with label " \
- + label + " in the default database; try installing " \
- + "the optional package database_cremona_ellcurve which " \
--- src/sage/databases/cremona.py.orig 2019-06-26 14:41:04.000000000 -0600
+++ src/sage/databases/cremona.py 2019-09-09 15:37:13.321511378 -0600
@@ -842,7 +842,8 @@ class MiniCremonaDatabase(SQLDatabase):
message = "There is no elliptic curve with label " \
+ label + " in the default database; try installing " \
+ "the optional package database_cremona_ellcurve which " \
- + "contains the complete Cremona database"
+ + "contains the complete Cremona database: " \
+ + "sudo dnf install sagemath-data-elliptic_curves_large"
raise ValueError(message)
ainvs = eval(c[0])
data = {'cremona_label': label,
@@ -1683,10 +1674,12 @@ def CremonaDatabase(name=None,mini=None,
if name is None and not set_global:
return _db
if set_global and name is None:
- if is_package_installed('database_cremona_ellcurve'):
- name = 'cremona'
- else:
- name = 'cremona mini'
+ # currently the sagemath rpm package only installs cremona mini
+ #if is_package_installed('database_cremona_ellcurve'):
+ # name = 'cremona'
+ #else:
+ # name = 'cremona mini'
+ name = 'cremona mini'
if name == 'cremona':
mini = False
elif name == 'cremona mini':
@@ -1640,6 +1641,7 @@ class LargeCremonaDatabase(MiniCremonaDa
con.executemany("UPDATE t_curve SET gens=? WHERE curve=?", \
curve_data)
print("Committing...")
+ self.commit()
if largest_conductor and int(v[0]) > largest_conductor: break
_db = None