No, that is not necessary. The easiest fix is to just create a new branch, and do things there.
Aaron Meurer On Wed, Jul 9, 2014 at 4:32 PM, Alan Bromborsky <abro...@verizon.net> wrote: > Should I wipe out my brombo/sympy repository and recreate it from > scratch? > > > > On 07/09/2014 04:05 PM, Sudhanshu Mishra wrote: > > I tried doing that but it failed with too many merge conflicts. I don't > know any other smart way to resolve it. Maybe @Ondrej can help. > > Regards > Sudhanshu Mishra > > > > On Thu, Jul 10, 2014 at 12:30 AM, Alan Bromborsky <abro...@verizon.net> > wrote: > >> How do I rebase? >> >> >> On 07/09/2014 01:21 PM, Sudhanshu Mishra wrote: >> >> Yeah. It looks like master hasn't been updated since VERY long time! It >> should be rebased. >> >> Regards >> Sudhanshu Mishra >> >> >> >> On Wed, Jul 9, 2014 at 10:32 PM, Ondřej Čertík <ondrej.cer...@gmail.com> >> wrote: >> >>> Thanks. Now you just create the pull request --- I did it for you: >>> >>> https://github.com/sympy/sympy/pull/7722 >>> >>> However, it seems you might have committed a lot of unrelated changes >>> into your commits, so somebody will have to clean it up. >>> >>> Ondrej >>> >>> On Wed, Jul 9, 2014 at 10:54 AM, Alan Bromborsky <abro...@verizon.net> >>> wrote: >>> > I have pushed my latest code, test, examples, and docs to my sympy >>> branch >>> > https://github.com/brombo/sympy. I don't remember what to do next. >>> > >>> > >>> > >>> > On 07/09/2014 12:14 PM, Ondřej Čertík wrote: >>> >> >>> >> Yes, please submit the pull request, we'll have a look. >>> >> >>> >> But to answer your question, to make it work with python 3, the same >>> >> source code must be changed to work with both Python 2 and 3. >>> >> >>> >> Ondrej >>> >> >>> >> On Tue, Jul 8, 2014 at 11:46 PM, Sudhanshu Mishra <mrsu...@gmail.com> >>> >> wrote: >>> >>> >>> >>> I think you should submit the pull request first. It would be easier >>> to >>> >>> debug the problem after looking at the code. >>> >>> >>> >>> Regards >>> >>> Sudhanshu Mishra >>> >>> >>> >>> >>> >>> >>> >>> On Wed, Jul 9, 2014 at 6:28 AM, Alan Bromborsky <abro...@verizon.net >>> > >>> >>> wrote: >>> >>>> >>> >>>> What I meant was that I get errors when I run >>> >>>> >>> >>>> python3 bin/test sympy/galgebra >>> >>>> >>> >>>> Should I convert my code that works with python2.7 to python3 with >>> 2to3 >>> >>>> or >>> >>>> should I do it by hand? >>> >>>> >>> >>>> >>> >>>> On 07/08/2014 08:29 PM, Ondřej Čertík wrote: >>> >>>>> >>> >>>>> Hi Alan, >>> >>>>> >>> >>>>> Run the tests like this: >>> >>>>> >>> >>>>> ondrej@kittiwake:~/repos/sympy(master)$ bin/test sympy/galgebra >>> >>>>> ============================= test process starts >>> >>>>> ============================== >>> >>>>> executable: /usr/bin/python (2.7.3-final-0) [CPython] >>> >>>>> architecture: 64-bit >>> >>>>> cache: yes >>> >>>>> ground types: python >>> >>>>> random seed: 32878360 >>> >>>>> hash randomization: on (PYTHONHASHSEED=1910459320) >>> >>>>> >>> >>>>> sympy/galgebra/tests/test_ga.py[23] .....ffffff... >>> >>>>> >>> >>>>> ... >>> >>>>> >>> >>>>> >>> >>>>> Then run Python 3 tests like this: >>> >>>>> >>> >>>>> ondrej@kittiwake:~/repos/sympy(master)$ python3 bin/test >>> sympy/galgebra >>> >>>>> ============================= test process starts >>> >>>>> ============================== >>> >>>>> executable: /usr/bin/python3 (3.2.3-final-0) [CPython] >>> >>>>> architecture: 64-bit >>> >>>>> cache: yes >>> >>>>> ground types: python >>> >>>>> random seed: 43472990 >>> >>>>> hash randomization: on (PYTHONHASHSEED=3165272445) >>> >>>>> >>> >>>>> sympy/galgebra/tests/test_ga.py[23] ... >>> >>>>> >>> >>>>> >>> >>>>> That's it. >>> >>>>> >>> >>>>> Ondrej >>> >>>>> >>> >>>>> On Tue, Jul 8, 2014 at 6:06 PM, Alan Bromborsky < >>> abro...@verizon.net> >>> >>>>> wrote: >>> >>>>>> >>> >>>>>> Please explain. What should I do? >>> >>>>>> >>> >>>>>> >>> >>>>>> On 07/08/2014 07:50 PM, Ondřej Čertík wrote: >>> >>>>>>> >>> >>>>>>> On Tue, Jul 8, 2014 at 4:05 PM, Alan Bromborsky < >>> abro...@verizon.net> >>> >>>>>>> wrote: >>> >>>>>>>> >>> >>>>>>>> So will the output of 2to3 run in python2.7? >>> >>>>>>> >>> >>>>>>> The 2to3 runs in Python 2.7, but you should not be running it. >>> >>>>>>> >>> >>>>>>> Ondrej >>> >>>>>>> >>> >>>>>> -- >>> >>>>>> You received this message because you are subscribed to the Google >>> >>>>>> Groups >>> >>>>>> "sympy" group. >>> >>>>>> To unsubscribe from this group and stop receiving emails from it, >>> send >>> >>>>>> an >>> >>>>>> email to sympy+unsubscr...@googlegroups.com. >>> >>>>>> To post to this group, send email to sympy@googlegroups.com. >>> >>>>>> Visit this group at http://groups.google.com/group/sympy. >>> >>>>>> To view this discussion on the web visit >>> >>>>>> >>> >>>>>> >>> https://groups.google.com/d/msgid/sympy/53BC8786.8060003%40verizon.net. >>> >>>>>> >>> >>>>>> For more options, visit https://groups.google.com/d/optout. >>> >>>> >>> >>>> >>> >>>> -- >>> >>>> You received this message because you are subscribed to the Google >>> >>>> Groups >>> >>>> "sympy" group. >>> >>>> To unsubscribe from this group and stop receiving emails from it, >>> send >>> >>>> an >>> >>>> email to sympy+unsubscr...@googlegroups.com. >>> >>>> To post to this group, send email to sympy@googlegroups.com. >>> >>>> Visit this group at http://groups.google.com/group/sympy. >>> >>>> To view this discussion on the web visit >>> >>>> >>> https://groups.google.com/d/msgid/sympy/53BC93A8.5060504%40verizon.net. >>> >>>> >>> >>>> For more options, visit https://groups.google.com/d/optout. >>> >>> >>> >>> >>> >>> -- >>> >>> You received this message because you are subscribed to the Google >>> Groups >>> >>> "sympy" group. >>> >>> To unsubscribe from this group and stop receiving emails from it, >>> send an >>> >>> email to sympy+unsubscr...@googlegroups.com. >>> >>> To post to this group, send email to sympy@googlegroups.com. >>> >>> Visit this group at http://groups.google.com/group/sympy. >>> >>> To view this discussion on the web visit >>> >>> >>> >>> >>> https://groups.google.com/d/msgid/sympy/CAFW_KCSsqZBs3MMkR0ZN8MB2pToXMa6cyZd%2BhNvpPhY1ykcumg%40mail.gmail.com >>> . >>> >>> >>> >>> For more options, visit https://groups.google.com/d/optout. >>> > >>> > >>> > -- >>> > You received this message because you are subscribed to the Google >>> Groups >>> > "sympy" group. >>> > To unsubscribe from this group and stop receiving emails from it, send >>> an >>> > email to sympy+unsubscr...@googlegroups.com. >>> > To post to this group, send email to sympy@googlegroups.com. >>> > Visit this group at http://groups.google.com/group/sympy. >>> > To view this discussion on the web visit >>> > https://groups.google.com/d/msgid/sympy/53BD73CD.2080208%40verizon.net >>> . >>> > >>> > For more options, visit https://groups.google.com/d/optout. >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "sympy" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to sympy+unsubscr...@googlegroups.com. >>> To post to this group, send email to sympy@googlegroups.com. >>> Visit this group at http://groups.google.com/group/sympy. >>> To view this discussion on the web visit >>> https://groups.google.com/d/msgid/sympy/CADDwiVAh8g5h4TNRoJKXAsK07Q-mzq5EApTXgcgYhuxqGsZJrw%40mail.gmail.com >>> . >>> For more options, visit https://groups.google.com/d/optout. >>> >> >> -- >> You received this message because you are subscribed to the Google Groups >> "sympy" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to sympy+unsubscr...@googlegroups.com. >> To post to this group, send email to sympy@googlegroups.com. >> Visit this group at http://groups.google.com/group/sympy. >> To view this discussion on the web visit >> https://groups.google.com/d/msgid/sympy/CAFW_KCQu-ugBfZ4H3fw8emWBVxifsmrp9WLTY8YsuS_M%2Bc52Lw%40mail.gmail.com >> <https://groups.google.com/d/msgid/sympy/CAFW_KCQu-ugBfZ4H3fw8emWBVxifsmrp9WLTY8YsuS_M%2Bc52Lw%40mail.gmail.com?utm_medium=email&utm_source=footer>. >> >> >> For more options, visit https://groups.google.com/d/optout. >> >> >> -- >> You received this message because you are subscribed to the Google Groups >> "sympy" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to sympy+unsubscr...@googlegroups.com. >> To post to this group, send email to sympy@googlegroups.com. >> Visit this group at http://groups.google.com/group/sympy. >> To view this discussion on the web visit >> https://groups.google.com/d/msgid/sympy/53BD914C.1000201%40verizon.net >> <https://groups.google.com/d/msgid/sympy/53BD914C.1000201%40verizon.net?utm_medium=email&utm_source=footer>. >> >> >> For more options, visit https://groups.google.com/d/optout. >> > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sympy+unsubscr...@googlegroups.com. > To post to this group, send email to sympy@googlegroups.com. > Visit this group at http://groups.google.com/group/sympy. > To view this discussion on the web visit > https://groups.google.com/d/msgid/sympy/CAFW_KCT2AuSsLEtnffFD909YwPDOzrvtWrnD3x-koirJQ%3DTH-Q%40mail.gmail.com > <https://groups.google.com/d/msgid/sympy/CAFW_KCT2AuSsLEtnffFD909YwPDOzrvtWrnD3x-koirJQ%3DTH-Q%40mail.gmail.com?utm_medium=email&utm_source=footer> > . > For more options, visit https://groups.google.com/d/optout. > > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sympy+unsubscr...@googlegroups.com. > To post to this group, send email to sympy@googlegroups.com. > Visit this group at http://groups.google.com/group/sympy. > To view this discussion on the web visit > https://groups.google.com/d/msgid/sympy/53BDB4D8.9090808%40verizon.net > <https://groups.google.com/d/msgid/sympy/53BDB4D8.9090808%40verizon.net?utm_medium=email&utm_source=footer> > . > > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to sympy+unsubscr...@googlegroups.com. To post to this group, send email to sympy@googlegroups.com. Visit this group at http://groups.google.com/group/sympy. To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CAKgW%3D6%2Bvk%2Bgo07T3RmXNZRi3Kq5_RZKdGG3WOyT0sf-Z8uQjOg%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
