On Sat, Feb 04, 2012 at 12:06:04AM +0100, Nicolas M. Thiery wrote:
> On Fri, Feb 03, 2012 at 11:45:14PM +0100, Nicolas M. Thiery wrote:
> > posets is a trivial rebase. I'll try to do it tonight if Sage compiles
> > in time.
>
> Voilà, c'est fait, mais en aveugle: j'ai récupéré le patch rebasé
> d'une 5.0 beta1 que j'avais dans un coin. Mais je n'ai pas encore pu
> tester avec la 5.0 beta2 qui compile. Tu peux vérifier que c'est bon?
It seems to be ok: next problem is a short but non-trivial conflict:
application de trac_8327_universal_cyclotomic_field-cs.patch
patching file sage/modules/free_module.py
Hunk #2 FAILED at 564
1 out of 2 hunks FAILED -- saving rejects to file
sage/modules/free_module.py.rej
--- free_module.py
+++ free_module.py
@@ -564,7 +565,7 @@ class FreeModule_generic(module.Module_o
Category of modules with basis over Integer Ring
"""
- if not isinstance(base_ring, commutative_ring.CommutativeRing):
+ if base_ring not in CommutativeRings():
raise TypeError, "base_ring (=%s) must be a commutative
ring"%base_ring
rank = sage.rings.integer.Integer(rank)
if rank < 0:
It seems to conflict with Simon huge work on Categories. I'm waiting Christian
green light to investigate further.
Christian: are we allowed to rebase those patches ?
Cheers,
Florent
--
You received this message because you are subscribed to the Google Groups
"sage-combinat-devel" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-combinat-devel?hl=en.
