zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rebuild for fflas-ffpack 2.2.2, givaro 4.0.2, and linbox 1.4.2.

Browse source 
Also, GAP packages atlasrep, design, and hap are now available.
This commit is contained in:
Jerry James 2016-08-15 09:38:23 -06:00
parent b1181ef635
commit a3d306800c
2 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sagemath-gap-hap.patch
View file

@ -1,6 +1,6 @@
diff -up src/sage/groups/perm_gps/permgroup.py.orig src/sage/groups/perm_gps/permgroup.py
--- src/sage/groups/perm_gps/permgroup.py.orig 2015-10-11 17:56:24.028811706 -0300
+++ src/sage/groups/perm_gps/permgroup.py 2015-10-11 17:58:26.629816401 -0300
--- src/sage/groups/perm_gps/permgroup.py.orig 2015-07-26 07:34:43.000000000 -0600
+++ src/sage/groups/perm_gps/permgroup.py 2016-08-11 21:51:51.490143121 -0600
@@ -136,7 +136,6 @@ from sage.groups.perm_gps.permgroup_elem
from sage.groups.abelian_gps.abelian_group import AbelianGroup
from sage.misc.cachefunc import cached_method
@ -9,45 +9,55 @@ diff -up src/sage/groups/perm_gps/permgroup.py.orig src/sage/groups/perm_gps/per
from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
from sage.categories.all import FiniteEnumeratedSets
from sage.groups.conjugacy_classes import ConjugacyClassGAP
@@ -181,8 +180,7 @@ def hap_decorator(f):
@@ -155,7 +154,10 @@ def load_hap():
try:
gap.load_package("hap")
except Exception:
- gap.load_package("hap")
+ try:
+ gap.load_package("hap")
+ except Exception:
+ raise RuntimeError("gap-hap package failed to load.")
def hap_decorator(f):
"""
@@ -181,8 +183,6 @@ def hap_decorator(f):
"""
@wraps(f)
def wrapped(self, n, p=0):
- if not is_package_installed('gap_packages'):
- raise RuntimeError("You must install the optional gap_packages package.")
+ raise RuntimeError("gap-hap package not available.")
load_hap()
from sage.rings.arith import is_prime
if not (p == 0 or is_prime(p)):
@@ -1617,9 +1615,7 @@ class PermutationGroup_generic(group.Fin
@@ -1617,9 +1617,7 @@ class PermutationGroup_generic(group.Fin
try:
return [Integer(n) for n in self._gap_().IdGroup()]
except RuntimeError:
- if not is_package_installed('database_gap'):
- raise RuntimeError("You must install the optional database_gap package first.")
- raise
+ raise RuntimeError("gap-hap package not available.")
+ raise RuntimeError("gap-hap package error.")
def id(self):
"""
@@ -1670,9 +1666,7 @@ class PermutationGroup_generic(group.Fin
@@ -1670,9 +1668,7 @@ class PermutationGroup_generic(group.Fin
try:
return Integer(self._gap_().PrimitiveIdentification())
except RuntimeError:
- if not is_package_installed('database_gap'):
- raise RuntimeError("You must install the optional database_gap package first.")
- raise
+ raise RuntimeError("gap-hap package not available.")
+ raise RuntimeError("gap-hap package error.")
def center(self):
"""
@@ -3959,8 +3953,7 @@ class PermutationGroup_generic(group.Fin
@@ -3959,8 +3955,6 @@ class PermutationGroup_generic(group.Fin
- David Joyner and Graham Ellis
"""
- if not is_package_installed('gap_packages'):
- raise RuntimeError("You must install the optional gap_packages package.")
+ raise RuntimeError("gap-hap package not available.")
load_hap()
from sage.rings.arith import is_prime
if not (p == 0 or is_prime(p)):