Re: [sage-combinat-devel] Re: The queue on 5.6.beta2
On 1/6/13 2:35 PM, Nicolas M. Thiery wrote: > On Sun, Jan 06, 2013 at 01:57:43PM -0800, Anne Schilling wrote: >> Thanks, but it does not work for me (even after removing the commas that >> appeared before the #+disabled). > > Do you still have issues? It works for me for 5.5. > > For 5.6 beta I can work on rebasing the patches on Tuesday. I fixed it. But it was broken before. Cheers, Anne -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
[sage-combinat-devel] Re: The queue on 5.6.beta2
Correction to my previous, the current guards are stored in .hg/patches/guards, not .hg/guards, according to the Mercurial book. cheers, Hugh On Sunday, January 6, 2013 6:54:01 PM UTC-4, Hugh Thomas wrote: > > Hi Anne-- > > Sorry about the commas. > > It looks to me like your guards might be set wrong. I would try running > sage -combinat qselect and then try reapplying the queue. > > Or, of you prefer, you can look at/edit your .hg/guards file directly. It > seems to me that "disabled" must have gotten in there, because otherwise, > why would the 13742 patches still be being applied? > > cheers, > > Hugh > > On Sunday, January 6, 2013 5:57:43 PM UTC-4, Anne Schilling wrote: >> >> Hi Hugh, >> >> Thanks, but it does not work for me (even after removing the commas that >> appeared before the #+disabled). >> >> applying trac_13728-some_standard_methods_for_fields-cs.patch >> applying trac_12587-simplicial_complex_hash-ts.patch >> applying trac_12587-simplicial_complex_hash_review-cs.patch >> applying trac_12587-ref-jhp.patch >> applying trac_13742.patch >> applying trac_13742_reviewer1.patch >> applying general_dihedral_group_fix.patch >> applying trac_13727_dict_addition_doc-cs.patch >> applying trac_13119_apply_module_morphism_bugfix-mz.patch >> applying trac_13403-bijection_KR_crystals_tableaux-ts.patch >> applying trac_13762_k_quotient.patch >> applying trac_13074-tuples-of-tableaux-am.patch >> applying trac_12518-enumerated_set_from_iterator-vd.patch >> skipping >> trac_13579-temporarily_disable_cmdline_tests_for_security-nt.patch - >> guarded by '+5_4' >> applying trac_13911-doctests.patch >> applying trac12215_weak_cached_function-sk.patch >> patching file sage/misc/cachefunc.pyx >> Hunk #4 succeeded at 348 with fuzz 2 (offset 0 lines). >> applying trac12215_segfault_fixes.patch >> applying trac_13460-RC_spinor-ts.patch >> applying trac_13840-integer_list_speedup-ts.patch >> applying trac_10193-graded_enumerated_sets-nt.patch >> patching file sage/combinat/integer_vector_weighted.py >> Hunk #1 FAILED at 0 >> Hunk #4 FAILED at 199 >> 2 out of 4 hunks FAILED -- saving rejects to file >> sage/combinat/integer_vector_weighted.py.rej >> patch failed, unable to continue (try -v) >> patch failed, rejects left in working dir >> errors during apply, please fix and refresh >> trac_10193-graded_enumerated_sets-nt.patch >> >> Best, >> >> Anne >> >> On 1/6/13 11:16 AM, Hugh Thomas wrote: >> > >> > Hi Anne-- >> > >> > I have disabled the 13742 patches. 5.5 should work fine now with the >> queue applied. >> > >> > cheers, >> > >> > Hugh >> > >> > On Friday, January 4, 2013 12:06:45 PM UTC-4, Hugh Thomas wrote: >> > >> > >> > Hi everyone! >> > >> > Below are the results of my attempt to apply the queue on >> 5.6.beta2. >> > >> > Nicolas: trac_10193-graded_enumerated_sets-nt.patch needs to be >> rebased over #13742 (Nathann's ticket about the permutations code), which >> needs to be added into the queue. >> > Also, category-symmetric_groups-nt.patch needs a trivial rebase >> over #13366 >> > >> > Travis: trac_8392-check_permutation-ts.patch also needs to be >> rebased over #13742. >> > >> > Christian: trac_8327_universal_cyclotomic_field-cs.patch needs to >> be rebased over your patches #13727 and #13728, which also need to be added >> into the queue. (Unless I'm mistaken, the rebase just >> > amounts to deleting the corresponding hunks from trac_8327.) >> > >> > Florent: gap3_spkg_doc_link-fh.patch needs what may be a trivial >> rebase over #13211 (GAP upgrade). >> > >> > cheers, >> > >> > Hugh >> > -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To view this discussion on the web visit https://groups.google.com/d/msg/sage-combinat-devel/-/-bw_kp8IMLYJ. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
[sage-combinat-devel] Re: The queue on 5.6.beta2
Hi Anne-- Sorry about the commas. It looks to me like your guards might be set wrong. I would try running sage -combinat qselect and then try reapplying the queue. Or, of you prefer, you can look at/edit your .hg/guards file directly. It seems to me that "disabled" must have gotten in there, because otherwise, why would the 13742 patches still be being applied? cheers, Hugh On Sunday, January 6, 2013 5:57:43 PM UTC-4, Anne Schilling wrote: > > Hi Hugh, > > Thanks, but it does not work for me (even after removing the commas that > appeared before the #+disabled). > > applying trac_13728-some_standard_methods_for_fields-cs.patch > applying trac_12587-simplicial_complex_hash-ts.patch > applying trac_12587-simplicial_complex_hash_review-cs.patch > applying trac_12587-ref-jhp.patch > applying trac_13742.patch > applying trac_13742_reviewer1.patch > applying general_dihedral_group_fix.patch > applying trac_13727_dict_addition_doc-cs.patch > applying trac_13119_apply_module_morphism_bugfix-mz.patch > applying trac_13403-bijection_KR_crystals_tableaux-ts.patch > applying trac_13762_k_quotient.patch > applying trac_13074-tuples-of-tableaux-am.patch > applying trac_12518-enumerated_set_from_iterator-vd.patch > skipping > trac_13579-temporarily_disable_cmdline_tests_for_security-nt.patch - > guarded by '+5_4' > applying trac_13911-doctests.patch > applying trac12215_weak_cached_function-sk.patch > patching file sage/misc/cachefunc.pyx > Hunk #4 succeeded at 348 with fuzz 2 (offset 0 lines). > applying trac12215_segfault_fixes.patch > applying trac_13460-RC_spinor-ts.patch > applying trac_13840-integer_list_speedup-ts.patch > applying trac_10193-graded_enumerated_sets-nt.patch > patching file sage/combinat/integer_vector_weighted.py > Hunk #1 FAILED at 0 > Hunk #4 FAILED at 199 > 2 out of 4 hunks FAILED -- saving rejects to file > sage/combinat/integer_vector_weighted.py.rej > patch failed, unable to continue (try -v) > patch failed, rejects left in working dir > errors during apply, please fix and refresh > trac_10193-graded_enumerated_sets-nt.patch > > Best, > > Anne > > On 1/6/13 11:16 AM, Hugh Thomas wrote: > > > > Hi Anne-- > > > > I have disabled the 13742 patches. 5.5 should work fine now with the > queue applied. > > > > cheers, > > > > Hugh > > > > On Friday, January 4, 2013 12:06:45 PM UTC-4, Hugh Thomas wrote: > > > > > > Hi everyone! > > > > Below are the results of my attempt to apply the queue on 5.6.beta2. > > > > Nicolas: trac_10193-graded_enumerated_sets-nt.patch needs to be > rebased over #13742 (Nathann's ticket about the permutations code), which > needs to be added into the queue. > > Also, category-symmetric_groups-nt.patch needs a trivial rebase over > #13366 > > > > Travis: trac_8392-check_permutation-ts.patch also needs to be > rebased over #13742. > > > > Christian: trac_8327_universal_cyclotomic_field-cs.patch needs to be > rebased over your patches #13727 and #13728, which also need to be added > into the queue. (Unless I'm mistaken, the rebase just > > amounts to deleting the corresponding hunks from trac_8327.) > > > > Florent: gap3_spkg_doc_link-fh.patch needs what may be a trivial > rebase over #13211 (GAP upgrade). > > > > cheers, > > > > Hugh > -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To view this discussion on the web visit https://groups.google.com/d/msg/sage-combinat-devel/-/lx8trCY7jRIJ. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
Re: [sage-combinat-devel] Re: The queue on 5.6.beta2
On Sun, Jan 06, 2013 at 01:57:43PM -0800, Anne Schilling wrote: > Thanks, but it does not work for me (even after removing the commas that > appeared before the #+disabled). Do you still have issues? It works for me for 5.5. For 5.6 beta I can work on rebasing the patches on Tuesday. Cheers, Nicolas -- Nicolas M. Thiéry "Isil" http://Nicolas.Thiery.name/ -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
[sage-combinat-devel] Re: conflict between "pretty_console_print-EliX-jbp" and trac_12719 patches
Hi! It's my fault, you could disable my patch (pretty_console_print-EliX-jbp patch) if you need... It's a simple AsciiArt (like in MuPad) which I use before a nice qt console (I hope). Happy new year! Cheers, Jean-Baptiste Le dimanche 6 janvier 2013 20:31:32 UTC+1, Hugh Thomas a écrit : > > > Hi! > > There is a conflict between the pretty_console_print-EliX-jbp patch and > the trac_12719 patches (upgrading IPython). I disabled the trac_12719 > patches for now, since they are at the very bottom of the queue. > > cheers, > > Hugh > -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To view this discussion on the web visit https://groups.google.com/d/msg/sage-combinat-devel/-/y0DsmKEH3PcJ. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
[sage-combinat-devel] Re: The queue on 5.6.beta2
Hi Hugh, Thanks, but it does not work for me (even after removing the commas that appeared before the #+disabled). applying trac_13728-some_standard_methods_for_fields-cs.patch applying trac_12587-simplicial_complex_hash-ts.patch applying trac_12587-simplicial_complex_hash_review-cs.patch applying trac_12587-ref-jhp.patch applying trac_13742.patch applying trac_13742_reviewer1.patch applying general_dihedral_group_fix.patch applying trac_13727_dict_addition_doc-cs.patch applying trac_13119_apply_module_morphism_bugfix-mz.patch applying trac_13403-bijection_KR_crystals_tableaux-ts.patch applying trac_13762_k_quotient.patch applying trac_13074-tuples-of-tableaux-am.patch applying trac_12518-enumerated_set_from_iterator-vd.patch skipping trac_13579-temporarily_disable_cmdline_tests_for_security-nt.patch - guarded by '+5_4' applying trac_13911-doctests.patch applying trac12215_weak_cached_function-sk.patch patching file sage/misc/cachefunc.pyx Hunk #4 succeeded at 348 with fuzz 2 (offset 0 lines). applying trac12215_segfault_fixes.patch applying trac_13460-RC_spinor-ts.patch applying trac_13840-integer_list_speedup-ts.patch applying trac_10193-graded_enumerated_sets-nt.patch patching file sage/combinat/integer_vector_weighted.py Hunk #1 FAILED at 0 Hunk #4 FAILED at 199 2 out of 4 hunks FAILED -- saving rejects to file sage/combinat/integer_vector_weighted.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_10193-graded_enumerated_sets-nt.patch Best, Anne On 1/6/13 11:16 AM, Hugh Thomas wrote: > > Hi Anne-- > > I have disabled the 13742 patches. 5.5 should work fine now with the queue > applied. > > cheers, > > Hugh > > On Friday, January 4, 2013 12:06:45 PM UTC-4, Hugh Thomas wrote: > > > Hi everyone! > > Below are the results of my attempt to apply the queue on 5.6.beta2. > > Nicolas: trac_10193-graded_enumerated_sets-nt.patch needs to be rebased > over #13742 (Nathann's ticket about the permutations code), which needs to be > added into the queue. > Also, category-symmetric_groups-nt.patch needs a trivial rebase over > #13366 > > Travis: trac_8392-check_permutation-ts.patch also needs to be rebased > over #13742. > > Christian: trac_8327_universal_cyclotomic_field-cs.patch needs to be > rebased over your patches #13727 and #13728, which also need to be added into > the queue. (Unless I'm mistaken, the rebase just > amounts to deleting the corresponding hunks from trac_8327.) > > Florent: gap3_spkg_doc_link-fh.patch needs what may be a trivial rebase > over #13211 (GAP upgrade). > > cheers, > > Hugh -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
[sage-combinat-devel] conflict between "pretty_console_print-EliX-jbp" and trac_12719 patches
Hi! There is a conflict between the pretty_console_print-EliX-jbp patch and the trac_12719 patches (upgrading IPython). I disabled the trac_12719 patches for now, since they are at the very bottom of the queue. cheers, Hugh -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To view this discussion on the web visit https://groups.google.com/d/msg/sage-combinat-devel/-/CqSGu8aG5IoJ. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
[sage-combinat-devel] Re: The queue on 5.6.beta2
Hi Anne-- I have disabled the 13742 patches. 5.5 should work fine now with the queue applied. cheers, Hugh On Friday, January 4, 2013 12:06:45 PM UTC-4, Hugh Thomas wrote: > > > Hi everyone! > > Below are the results of my attempt to apply the queue on 5.6.beta2. > > Nicolas: trac_10193-graded_enumerated_sets-nt.patch needs to be rebased > over #13742 (Nathann's ticket about the permutations code), which needs to > be added into the queue. > Also, category-symmetric_groups-nt.patch needs a trivial rebase over #13366 > > Travis: trac_8392-check_permutation-ts.patch also needs to be rebased over > #13742. > > Christian: trac_8327_universal_cyclotomic_field-cs.patch needs to be > rebased over your patches #13727 and #13728, which also need to be added > into the queue. (Unless I'm mistaken, the rebase just amounts to deleting > the corresponding hunks from trac_8327.) > > Florent: gap3_spkg_doc_link-fh.patch needs what may be a trivial rebase > over #13211 (GAP upgrade). > > cheers, > > Hugh > -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To view this discussion on the web visit https://groups.google.com/d/msg/sage-combinat-devel/-/_mv-zUto7RsJ. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
Re: [sage-combinat-devel] Re: The queue on 5.6.beta2
On 1/6/13 8:43 AM, Christian Stump wrote: > Hi, > > I wasn't able to get the queue running on 5.6.beta2 here - but I hope > I didn't introduce too many new problems trying... > > @Travis: did you introduce #+5_6_beta1, 10193_rebase ? This way, one > cannot install the combinat queue anymore since "sage -combinat > qselect" doesn't understand this guard... I removed the , 10193_rebase in the series file and fixed some other typos there. However, the queue still does not apply to sage-5.5 due to ... applying trac_13840-integer_list_speedup-ts.patch applying trac_10193-graded_enumerated_sets-nt.patch patching file sage/combinat/integer_vector_weighted.py Hunk #1 FAILED at 0 Hunk #4 FAILED at 199 2 out of 4 hunks FAILED -- saving rejects to file sage/combinat/integer_vector_weighted.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_10193-graded_enumerated_sets-nt.patch Nicolas, could you please fix this as soon as possible? I need to have a look at a later patch for Dan Bump and cannot get to it. Thanks! Anne -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
[sage-combinat-devel] Re: The queue on 5.6.beta2
Hi! I think it would be difficult to get the queue to run on 5.6.beta2 without rebasing Nicolas's trac_10193 patch, since it is then used by his functorial patches, and quite a lot of other patches depend on them. My suggestion would be not to worry about it until Nicolas has had a chance to do the rebase -- so far as I know, no one is clamouring to do combinat development on the 5.6 beta's. ** Christian, it turns out I missed a hunk from 8327 which needed to be removed (because it now appears in one of 13727/13728), so the queue didn't apply on 5.5 after you imported 13727 and 13728. I have removed it from 8327 now. I hope that's okay. cheers, Hugh On Sunday, January 6, 2013 12:43:36 PM UTC-4, Christian Stump wrote: > > Hi, > > I wasn't able to get the queue running on 5.6.beta2 here - but I hope > I didn't introduce too many new problems trying... > > @Travis: did you introduce #+5_6_beta1, 10193_rebase ? This way, one > cannot install the combinat queue anymore since "sage -combinat > qselect" doesn't understand this guard... > > Sorry for possible mistakes, Christian > -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To view this discussion on the web visit https://groups.google.com/d/msg/sage-combinat-devel/-/rodeB0Llm1cJ. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
[sage-combinat-devel] Re: The queue on 5.6.beta2
Hi, I wasn't able to get the queue running on 5.6.beta2 here - but I hope I didn't introduce too many new problems trying... @Travis: did you introduce #+5_6_beta1, 10193_rebase ? This way, one cannot install the combinat queue anymore since "sage -combinat qselect" doesn't understand this guard... Sorry for possible mistakes, Christian -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
