forked from mirrors/nixpkgs
sage: drop unused patches
This commit is contained in:
parent
a33ee551ce
commit
ca6475b5e8
|
@ -1,16 +0,0 @@
|
|||
diff --git a/src/sage/interfaces/mwrank.py b/src/sage/interfaces/mwrank.py
|
||||
index 4417b59276..ae57ca2991 100644
|
||||
--- a/src/sage/interfaces/mwrank.py
|
||||
+++ b/src/sage/interfaces/mwrank.py
|
||||
@@ -54,8 +54,9 @@ def Mwrank(options="", server=None, server_tmpdir=None):
|
||||
sage: M = Mwrank('-v 0 -l')
|
||||
sage: print(M('0 0 1 -1 0'))
|
||||
Curve [0,0,1,-1,0] : Rank = 1
|
||||
- Generator 1 is [0:-1:1]; height 0.0511114082399688
|
||||
- Regulator = 0.0511114082399688
|
||||
+ Generator 1 is [0:-1:1]; height 0.051111408239969
|
||||
+ Regulator = 0.051111408239969
|
||||
+
|
||||
"""
|
||||
global instances
|
||||
try:
|
|
@ -1,98 +0,0 @@
|
|||
diff --git a/src/sage/libs/eclib/interface.py b/src/sage/libs/eclib/interface.py
|
||||
index f77000c478..9d17d412ae 100644
|
||||
--- a/src/sage/libs/eclib/interface.py
|
||||
+++ b/src/sage/libs/eclib/interface.py
|
||||
@@ -1014,7 +1014,7 @@ class mwrank_MordellWeil(SageObject):
|
||||
WARNING: saturation at primes p > 2 will not be done;
|
||||
...
|
||||
Gained index 2
|
||||
- New regulator = 93.857300720636393209
|
||||
+ New regulator = 93.85730...
|
||||
(False, 2, '[ ]')
|
||||
sage: EQ.points()
|
||||
[[-2, 3, 1], [2707496766203306, 864581029138191, 2969715140223272], [-13422227300, -49322830557, 12167000000]]
|
||||
@@ -1025,7 +1025,7 @@ class mwrank_MordellWeil(SageObject):
|
||||
WARNING: saturation at primes p > 3 will not be done;
|
||||
...
|
||||
Gained index 3
|
||||
- New regulator = 10.4285889689595992455
|
||||
+ New regulator = 10.42858...
|
||||
(False, 3, '[ ]')
|
||||
sage: EQ.points()
|
||||
[[-2, 3, 1], [-14, 25, 8], [-13422227300, -49322830557, 12167000000]]
|
||||
@@ -1036,7 +1036,7 @@ class mwrank_MordellWeil(SageObject):
|
||||
WARNING: saturation at primes p > 5 will not be done;
|
||||
...
|
||||
Gained index 5
|
||||
- New regulator = 0.417143558758383969818
|
||||
+ New regulator = 0.41714...
|
||||
(False, 5, '[ ]')
|
||||
sage: EQ.points()
|
||||
[[-2, 3, 1], [-14, 25, 8], [1, -1, 1]]
|
||||
@@ -1221,7 +1221,7 @@ class mwrank_MordellWeil(SageObject):
|
||||
WARNING: saturation at primes p > 2 will not be done;
|
||||
...
|
||||
Gained index 2
|
||||
- New regulator = 93.857300720636393209
|
||||
+ New regulator = 93.85730...
|
||||
(False, 2, '[ ]')
|
||||
sage: EQ
|
||||
Subgroup of Mordell-Weil group: [[-2:3:1], [2707496766203306:864581029138191:2969715140223272], [-13422227300:-49322830557:12167000000]]
|
||||
@@ -1235,7 +1235,7 @@ class mwrank_MordellWeil(SageObject):
|
||||
WARNING: saturation at primes p > 3 will not be done;
|
||||
...
|
||||
Gained index 3
|
||||
- New regulator = 10.4285889689595992455
|
||||
+ New regulator = 10.42858...
|
||||
(False, 3, '[ ]')
|
||||
sage: EQ
|
||||
Subgroup of Mordell-Weil group: [[-2:3:1], [-14:25:8], [-13422227300:-49322830557:12167000000]]
|
||||
@@ -1249,7 +1249,7 @@ class mwrank_MordellWeil(SageObject):
|
||||
WARNING: saturation at primes p > 5 will not be done;
|
||||
...
|
||||
Gained index 5
|
||||
- New regulator = 0.417143558758383969818
|
||||
+ New regulator = 0.41714...
|
||||
(False, 5, '[ ]')
|
||||
sage: EQ
|
||||
Subgroup of Mordell-Weil group: [[-2:3:1], [-14:25:8], [1:-1:1]]
|
||||
diff --git a/src/sage/libs/eclib/mwrank.pyx b/src/sage/libs/eclib/mwrank.pyx
|
||||
index a4f89e1ca5..f8a22d2f55 100644
|
||||
--- a/src/sage/libs/eclib/mwrank.pyx
|
||||
+++ b/src/sage/libs/eclib/mwrank.pyx
|
||||
@@ -1234,9 +1234,9 @@ cdef class _two_descent:
|
||||
sage: D2.saturate()
|
||||
Searching for points (bound = 8)...done:
|
||||
found points which generate a subgroup of rank 3
|
||||
- and regulator 0.417143558758383969817119544618093396749810106098479
|
||||
+ and regulator 0.41714...
|
||||
Processing points found during 2-descent...done:
|
||||
- now regulator = 0.417143558758383969817119544618093396749810106098479
|
||||
+ now regulator = 0.41714...
|
||||
No saturation being done
|
||||
sage: D2.getbasis()
|
||||
'[[1:-1:1], [-2:3:1], [-14:25:8]]'
|
||||
@@ -1281,9 +1281,9 @@ cdef class _two_descent:
|
||||
sage: D2.saturate()
|
||||
Searching for points (bound = 8)...done:
|
||||
found points which generate a subgroup of rank 3
|
||||
- and regulator 0.417143558758383969817119544618093396749810106098479
|
||||
+ and regulator 0.41714...
|
||||
Processing points found during 2-descent...done:
|
||||
- now regulator = 0.417143558758383969817119544618093396749810106098479
|
||||
+ now regulator = 0.41714...
|
||||
No saturation being done
|
||||
sage: D2.getbasis()
|
||||
'[[1:-1:1], [-2:3:1], [-14:25:8]]'
|
||||
@@ -1329,9 +1329,9 @@ cdef class _two_descent:
|
||||
sage: D2.saturate()
|
||||
Searching for points (bound = 8)...done:
|
||||
found points which generate a subgroup of rank 3
|
||||
- and regulator 0.417143558758383969817119544618093396749810106098479
|
||||
+ and regulator 0.41714...
|
||||
Processing points found during 2-descent...done:
|
||||
- now regulator = 0.417143558758383969817119544618093396749810106098479
|
||||
+ now regulator = 0.41714...
|
||||
No saturation being done
|
||||
sage: D2.getbasis()
|
||||
'[[1:-1:1], [-2:3:1], [-14:25:8]]'
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/src/sage/all.py b/src/sage/all.py
|
||||
index 14cec431f1..25a35a0522 100644
|
||||
--- a/src/sage/all.py
|
||||
+++ b/src/sage/all.py
|
||||
@@ -310,6 +310,7 @@ warnings.filters.remove(('ignore', None, DeprecationWarning, None, 0))
|
||||
# Ignore all deprecations from IPython etc.
|
||||
warnings.filterwarnings('ignore',
|
||||
module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic)')
|
||||
+warnings.filterwarnings('ignore', "The 'normed' kwarg is deprecated, and has been replaced by the 'density' kwarg.") # matplotlib normed deprecation
|
||||
# However, be sure to keep OUR deprecation warnings
|
||||
warnings.filterwarnings('default',
|
||||
'[\s\S]*See http://trac.sagemath.org/[0-9]* for details.')
|
|
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||
# Revert the commit that made the sphinx build fork even in the single thread
|
||||
# case. For some yet unknown reason, that breaks the docbuild on nix and archlinux.
|
||||
# See https://groups.google.com/forum/#!msg/sage-packaging/VU4h8IWGFLA/mrmCMocYBwAJ.
|
||||
# https://trac.sagemath.org/ticket/26608
|
||||
./patches/revert-sphinx-always-fork.patch
|
||||
|
||||
# Make sure py2/py3 tests are only run when their expected context (all "sage"
|
||||
|
@ -54,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
in [
|
||||
# New glpk version has new warnings, filter those out until upstream sage has found a solution
|
||||
# https://trac.sagemath.org/ticket/24824
|
||||
./patches/pari-stackwarn.patch # not actually necessary since tha pari upgrade, but necessary for the glpk patch to apply
|
||||
./patches/pari-stackwarn.patch # not actually necessary since the pari upgrade, but necessary for the glpk patch to apply
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/dt-version-glpk-4.65-ignore-warnings.patch";
|
||||
sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp";
|
||||
|
|
Loading…
Reference in a new issue