mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-18 10:19:03 -04:00
1a0bd1afc6
Also: - Drop -lrslib, -gap-hap, and -flask patches. - Drop obsolete scriplets to fix F24 to F25 upgrade (bz 1594429 and 1618934). - Drop obsolete mktexlsr invocations. - Fix more Singular paths. - Fix still more uses of /usr/bin/env. - Drop disallow/dissallow fixup for cython; now fixed in cython itself.
43 lines
2 KiB
Diff
43 lines
2 KiB
Diff
diff -up src/sage/databases/cremona.py.orig src/sage/databases/cremona.py
|
|
--- src/sage/databases/cremona.py.orig 2018-08-03 05:10:08.000000000 -0600
|
|
+++ src/sage/databases/cremona.py 2018-08-29 08:48:43.090148635 -0600
|
|
@@ -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 SAGE_SHARE
|
|
from sage.misc.all import walltime
|
|
|
|
@@ -825,14 +824,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 " \
|
|
- + "contains the complete Cremona database"
|
|
raise ValueError(message)
|
|
ainvs = eval(c[0])
|
|
data = {'cremona_label': label,
|
|
@@ -1673,10 +1664,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':
|