Re: [sage-combinat-devel] updated series file

2011-04-23 Thread Anne Schilling
On 4/23/11 12:56 AM, Nicolas M. Thiery wrote: On Fri, Apr 22, 2011 at 08:15:40AM -0700, Anne Schilling wrote: On 4/22/11 3:49 AM, Nicolas M. Thiery wrote: On Sun, Apr 17, 2011 at 07:49:34PM -0700, Anne Schilling wrote: On 4/17/11 9:59 AM, Florent Hivert wrote: You should'nt simply disable the

Re: [sage-combinat-devel] updated series file

2011-04-23 Thread Nicolas M. Thiery
On Fri, Apr 22, 2011 at 08:15:40AM -0700, Anne Schilling wrote: > On 4/22/11 3:49 AM, Nicolas M. Thiery wrote: > >On Sun, Apr 17, 2011 at 07:49:34PM -0700, Anne Schilling wrote: > >>On 4/17/11 9:59 AM, Florent Hivert wrote: > >>>You should'nt simply disable them but add a guard against 4.7.1 with a

Re: [sage-combinat-devel] updated series file

2011-04-22 Thread Anne Schilling
On 4/22/11 3:49 AM, Nicolas M. Thiery wrote: On Sun, Apr 17, 2011 at 07:49:34PM -0700, Anne Schilling wrote: On 4/17/11 9:59 AM, Florent Hivert wrote: You should'nt simply disable them but add a guard against 4.7.1 with a note needs rebase (as #-4_7_1 # needs-rebase). Actually: #+4_7 # needs-

Re: [sage-combinat-devel] updated series file

2011-04-22 Thread Nicolas M. Thiery
On Sun, Apr 17, 2011 at 07:49:34PM -0700, Anne Schilling wrote: > On 4/17/11 9:59 AM, Florent Hivert wrote: > >You should'nt simply disable them but add a guard against 4.7.1 with a note > >needs rebase (as #-4_7_1 # needs-rebase). Actually: #+4_7 # needs-rebase The patch do not apply starting fr

Re: [sage-combinat-devel] updated series file

2011-04-22 Thread Vincent Delecroix
Hello, > skipping separatrix_diagram-vd.patch - guarded by '-4_7_1' > applying translation_surface_homology-vd.patch > unable to find 'sage/dynamics/flat_surfaces/separatrix_diagram.py' for > patching That's normal because translation_surface_homology-vd.patch depends on separatrix_diagram-vd.pat

Re: [sage-combinat-devel] updated series file

2011-04-20 Thread Nicolas M. Thiery
On Sun, Apr 17, 2011 at 07:49:34PM -0700, Anne Schilling wrote: > On 4/17/11 9:59 AM, Florent Hivert wrote: > >>I just updated the series file to reflect all patches that were merged into > >>sage-4.7 > >>and sage-4.7.1. I think Florent moved some of them wrongly to sage.4.7.1 > >>(they did not >

Re: [sage-combinat-devel] updated series file

2011-04-18 Thread Anne Schilling
Hello Vincent, With your recent changes I get applying trac_9439-hyperbolic_geometry-vd.patch applying trac_9557-fundamental_domains-vd.patch applying sl2z_decomposition-vd.patch skipping move_iet_into_dynamics-vd.patch - guarded by '-4_7_1' skipping improve_constructors_of_iet-vd.patch - guarde

Re: [sage-combinat-devel] updated series file

2011-04-18 Thread Anne Schilling
Hello Vincent, Anne, thank you for the job. I remark that some of my patches disappeared in the series file (not a problem but look strange). Oops, sorry, that was certainly not intentional. A real problem is that after all changes (on sage-4.6.2) I get ... ImportError: No module named rigge

Re: [sage-combinat-devel] updated series file

2011-04-18 Thread Vincent Delecroix
Hello, Anne, thank you for the job. I remark that some of my patches disappeared in the series file (not a problem but look strange). A real problem is that after all changes (on sage-4.6.2) I get ... ImportError: No module named rigged_configuration_element_type_A Error importing ipy_profile_sag

Re: [sage-combinat-devel] updated series file

2011-04-17 Thread Anne Schilling
On 4/17/11 9:59 AM, Florent Hivert wrote: Hi Anne, I just updated the series file to reflect all patches that were merged into sage-4.7 and sage-4.7.1. I think Florent moved some of them wrongly to sage.4.7.1 (they did not apply). Oups ! It seems indeed that I mixed things up between

Re: [sage-combinat-devel] updated series file

2011-04-17 Thread Florent Hivert
Hi Anne, > I just updated the series file to reflect all patches that were merged into > sage-4.7 > and sage-4.7.1. I think Florent moved some of them wrongly to sage.4.7.1 > (they did not > apply). Oups ! It seems indeed that I mixed things up between sage-4.7 and sage-4.7.1. Many thanks

[sage-combinat-devel] updated series file

2011-04-17 Thread Anne Schilling
Hi! I just updated the series file to reflect all patches that were merged into sage-4.7 and sage-4.7.1. I think Florent moved some of them wrongly to sage.4.7.1 (they did not apply). In the course I had to disable some patches by Mike Hansen on permutation groups, Nicolas, and Vincent on orig