Re: [sage-combinat-devel] Re: WARNING: Docbuilder patch (#6495) going into combinat

2013-02-20 Thread Franco Saliola
After a fresh install of sage-5.6, I try to install the sage-combinat
patches and 

> sage -combinat install
...
applying trac_6495-part1-moving-files-link.patch
patching file doc/en/reference/combinat/index.rst
Hunk #1 FAILED at 3
1 out of 3 hunks FAILED -- saving rejects to file
doc/en/reference/combinat/index.rst.rej
patching file doc/en/reference/cryptography/index.rst
Hunk #1 FAILED at 26
1 out of 1 hunks FAILED -- saving rejects to file
doc/en/reference/cryptography/index.rst.rej
patching file doc/en/reference/groups/index.rst
Hunk #2 succeeded at 30 with fuzz 1 (offset -9 lines).
patching file doc/en/reference/rings/index.rst
Hunk #2 FAILED at 15
1 out of 2 hunks FAILED -- saving rejects to file
doc/en/reference/rings/index.rst.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh
trac_6495-part1-moving-files-link.patch
Abort

--

On Wed, Feb 20, 2013 at 12:47 PM, Travis Scrimshaw wrote:

>Just as a "gotcha!", make its recommended on the ticket that you delete
> the old output directory before you rebuild the new documentation because
> the old files still hang around.
>
> Best,
> Travis
>
>
> On Tuesday, February 19, 2013 9:13:37 AM UTC-5, Travis Scrimshaw wrote:
>>
>> Here's the list of patches I disabled:
>>
>> - trac_10193-graded_enumerated_**sets-vd_no_more_nt.patch
>> - trac_10193-review-nb.patch
>> - trac_10193-more-vd.patch
>>
>> - trac_12940_affine_**permutations-td.patch
>>
>> - trac_8703-trees-fh.patch
>> - trac_13987_mary_trees-vp.**patch
>> - trees_symmetry_factor-fh.patch
>> - trac_11529-rooted_trees-fh.**patch
>> - shape_tree-fc.patch
>> - operads-fh.patch
>> - operads_more-fc.patch
>> - bintrees_leaf_paths-fh.patch
>> - q_tree_factorial-fc.patch
>> - algebras_over_operads-fc.**patch
>> - shuffle-operads-fc.patch
>>
>> - trac_14086-parking_**functions-dm.patch
>>
>> - sage-demos-and-tutorials-nt.**patch
>>
>> - trac_Kleshchev-partitions-**am.patch
>>
>> Here is the list of patches I rebased:
>>
>> - trac_13580-map_reduce-old-**fh.patch
>> - trac_10194-factories_policy-**fh.patch
>> - trac_11407-list_clone_improve-**fh.patch
>> - mutator-fh.patch
>> - trac_9280-graded-algebras-**example-fs.patch
>> - trac_10963-more_functorial_**constructions-nt.patch
>> - missing-doc-includes-nt.**patch
>> - finite_semigroup-nt.patch
>>
>> From the rejects, I suspect most of the patches in the trees block will
>> apply once #8703 is rebased.
>>
>> (Miraculously) Sage starts with the full queue applied.
>>
>> Best,
>> Travis
>>
>>  --
> You received this message because you are subscribed to the Google Groups
> "sage-combinat-devel" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to sage-combinat-devel+unsubscr...@googlegroups.com.
> To post to this group, send email to sage-combinat-devel@googlegroups.com.
> Visit this group at
> http://groups.google.com/group/sage-combinat-devel?hl=en.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>
>

-- 
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-combinat-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.




[sage-combinat-devel] Re: WARNING: Docbuilder patch (#6495) going into combinat

2013-02-20 Thread Travis Scrimshaw
   Just as a "gotcha!", make its recommended on the ticket that you delete 
the old output directory before you rebuild the new documentation because 
the old files still hang around.

Best,
Travis


On Tuesday, February 19, 2013 9:13:37 AM UTC-5, Travis Scrimshaw wrote:
>
> Here's the list of patches I disabled:
>
> - trac_10193-graded_enumerated_sets-vd_no_more_nt.patch
> - trac_10193-review-nb.patch
> - trac_10193-more-vd.patch
>
> - trac_12940_affine_permutations-td.patch
>
> - trac_8703-trees-fh.patch
> - trac_13987_mary_trees-vp.patch
> - trees_symmetry_factor-fh.patch
> - trac_11529-rooted_trees-fh.patch
> - shape_tree-fc.patch
> - operads-fh.patch
> - operads_more-fc.patch
> - bintrees_leaf_paths-fh.patch
> - q_tree_factorial-fc.patch
> - algebras_over_operads-fc.patch
> - shuffle-operads-fc.patch
>
> - trac_14086-parking_functions-dm.patch
>
> - sage-demos-and-tutorials-nt.patch
>
> - trac_Kleshchev-partitions-am.patch
>
> Here is the list of patches I rebased:
>
> - trac_13580-map_reduce-old-fh.patch
> - trac_10194-factories_policy-fh.patch
> - trac_11407-list_clone_improve-fh.patch
> - mutator-fh.patch
> - trac_9280-graded-algebras-example-fs.patch
> - trac_10963-more_functorial_constructions-nt.patch
> - missing-doc-includes-nt.patch
> - finite_semigroup-nt.patch
>
> From the rejects, I suspect most of the patches in the trees block will 
> apply once #8703 is rebased.
>
> (Miraculously) Sage starts with the full queue applied.
>
> Best,
> Travis
>
>

-- 
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-combinat-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.




[sage-combinat-devel] Re: WARNING: Docbuilder patch (#6495) going into combinat

2013-02-19 Thread Travis Scrimshaw
Hey Andrew,
There could likely be other dependencies that don't show up on trac 
because they were already merged into sage before the ticket came up for 
review. What I found was look for files which you get rejects on and see if 
there are any patches which modify said files between your version and 
5.7.rc0. I wish there was a better way to look through trac, but everytime 
I've done a search for a particular file, it hasn't worked for me... I'll 
do a more through search tomorrow (US Eastern time) if you haven't resolved 
it by then.

   There's another option (more of a hack solution), but create a dummy 
patch which just syncs up what the first #6495 patch expects to see and 
what is really there and guard it under #+5_7_beta2.

On Tuesday, February 19, 2013 10:11:57 PM UTC-5, Andrew Mathas wrote:
>
>
> You might have to add the patches from the dependency tickets listed at 
>> #6495.
>>
>> All of the patches listed on the ticket are already included BUT there is 
> also a dependency on 5.7.beta2, so I guess that in the series file the 
> guards should really be
>
> trac_6495-part1-moving-files-link.patch #+5_8_beta0 
> #-5_7_beta2
> trac_6495-part2-everything-else.patch  #+5_8_beta0 
> #-5_7_beta2
> ...
>
 
I'm fairly certain that would not be the correct guards because they would 
never apply.

Best,
Travis

-- 
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-combinat-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.




[sage-combinat-devel] Re: WARNING: Docbuilder patch (#6495) going into combinat

2013-02-19 Thread Andrew Mathas


> You might have to add the patches from the dependency tickets listed at 
> #6495.
>
> All of the patches listed on the ticket are already included BUT there is 
also a dependency on 5.7.beta2, so I guess that in the series file the 
guards should really be

trac_6495-part1-moving-files-link.patch #+5_8_beta0 
#-5_7_beta2
trac_6495-part2-everything-else.patch  #+5_8_beta0 
#-5_7_beta2
...

Unfortunately, the queue still won't apply to 5.6 even with these guards in 
place because later the patches which rely on #6495 now fail. 

As a result, I don't see an easy way to make the queue apply to both 5.6 
and 5.7.beta2+.

Andrew

-- 
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-combinat-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.




[sage-combinat-devel] Re: WARNING: Docbuilder patch (#6495) going into combinat

2013-02-19 Thread John H Palmieri


On Tuesday, February 19, 2013 6:23:08 PM UTC-8, Andrew Mathas wrote:
>
> Hi Travis,
>
> The queue isn't applying for in using version 5.6 even with this spkg 
> installed. Specifically, trac_6495-part1-moving-files-link.patch does not 
> apply. It's not a big deal as I can just move to 5.7.rc0 but it might 
> affect others.
>
> Andrew
>

You might have to add the patches from the dependency tickets listed at 
#6495.

-- 
John

-- 
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-combinat-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.




[sage-combinat-devel] Re: WARNING: Docbuilder patch (#6495) going into combinat

2013-02-19 Thread Andrew Mathas
Hi Travis,

The queue isn't applying for in using version 5.6 even with this spkg 
installed. Specifically, trac_6495-part1-moving-files-link.patch does not 
apply. It's not a big deal as I can just move to 5.7.rc0 but it might 
affect others.

Andrew

-- 
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-combinat-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.




[sage-combinat-devel] Re: WARNING: Docbuilder patch (#6495) going into combinat

2013-02-19 Thread Travis Scrimshaw
Here's the list of patches I disabled:

- trac_10193-graded_enumerated_sets-vd_no_more_nt.patch
- trac_10193-review-nb.patch
- trac_10193-more-vd.patch

- trac_12940_affine_permutations-td.patch

- trac_8703-trees-fh.patch
- trac_13987_mary_trees-vp.patch
- trees_symmetry_factor-fh.patch
- trac_11529-rooted_trees-fh.patch
- shape_tree-fc.patch
- operads-fh.patch
- operads_more-fc.patch
- bintrees_leaf_paths-fh.patch
- q_tree_factorial-fc.patch
- algebras_over_operads-fc.patch
- shuffle-operads-fc.patch

- trac_14086-parking_functions-dm.patch

- sage-demos-and-tutorials-nt.patch

- trac_Kleshchev-partitions-am.patch

Here is the list of patches I rebased:

- trac_13580-map_reduce-old-fh.patch
- trac_10194-factories_policy-fh.patch
- trac_11407-list_clone_improve-fh.patch
- mutator-fh.patch
- trac_9280-graded-algebras-example-fs.patch
- trac_10963-more_functorial_constructions-nt.patch
- missing-doc-includes-nt.patch
- finite_semigroup-nt.patch

>From the rejects, I suspect most of the patches in the trees block will 
apply once #8703 is rebased.

(Miraculously) Sage starts with the full queue applied.

Best,
Travis

-- 
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-combinat-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.