Re: [Cython] Git workflow, branches, pull requests
Hi, On Thu, May 5, 2011 at 12:52 PM, Dag Sverre Seljebotn wrote: > There was just a messup in git history: Mark's OpenMP pull request got > merged twice; all commits show up two times. > > It doesn't matter, since the two openmp branches with the same changes > merged OK, but we shouldn't make this a habit. For instance, the openMP > commits also show up as part of vitja's pull request, which is confusing. > > In Mercurial speak: The openmp branch was used like you would use a > Mercurial "patch queue" in one case, and as a branch in another case. In git > they are the same technically and you rely on conventions to make sure you > don't treat a "queue" as a "branch". > > OPTION A) Either i) only branch from master, or ii) make sure you agree with > whoever you're branching from that this is a "branch", not a "patch queue", > so that it isn't rebased under your feet. > > We could also, say, prepend all patch queues with an underscore (its > private). > > OPTION B) Stop rebasing. I'd have a very hard time doing that myself, but > nobody are pulling from dagss/cython these days anyway. What about: OPTION C) The one who pushes things into the master knows master enough to see whether or not it makes sense to merge this, or if it was already in, he/she will simply comment into the pull request and close it manually Ondrej ___ cython-devel mailing list cython-devel@python.org http://mail.python.org/mailman/listinfo/cython-devel
Re: [Cython] Git workflow, branches, pull requests
On Thu, May 12, 2011 at 11:34 PM, Dag Sverre Seljebotn wrote: > On 05/13/2011 12:36 AM, Ondrej Certik wrote: >> >> Hi, >> >> On Thu, May 5, 2011 at 12:52 PM, Dag Sverre Seljebotn >> wrote: >>> >>> There was just a messup in git history: Mark's OpenMP pull request got >>> merged twice; all commits show up two times. >>> >>> It doesn't matter, since the two openmp branches with the same changes >>> merged OK, but we shouldn't make this a habit. For instance, the openMP >>> commits also show up as part of vitja's pull request, which is confusing. >>> >>> In Mercurial speak: The openmp branch was used like you would use a >>> Mercurial "patch queue" in one case, and as a branch in another case. In >>> git >>> they are the same technically and you rely on conventions to make sure >>> you >>> don't treat a "queue" as a "branch". >>> >>> OPTION A) Either i) only branch from master, or ii) make sure you agree >>> with >>> whoever you're branching from that this is a "branch", not a "patch >>> queue", >>> so that it isn't rebased under your feet. >>> >>> We could also, say, prepend all patch queues with an underscore (its >>> private). >>> >>> OPTION B) Stop rebasing. I'd have a very hard time doing that myself, but >>> nobody are pulling from dagss/cython these days anyway. >> >> What about: >> >> OPTION C) The one who pushes things into the master knows master >> enough to see whether or not it makes sense to merge this, or if it >> was already in, he/she will simply comment into the pull request and >> close it manually > > This doesn't make sense to me. Are you sure you read the scenario correctly? You wrote: " There was just a messup in git history: Mark's OpenMP pull request got merged twice; all commits show up two times. " So somebody pushed in Marks' patches twice. My OPTION C) is that the one, who pushes patches in is responsible to make sure that they only get pushed in once. That's what we do in sympy, we don't have any formal option A or B, but people with push access must prove that they are capable of using git, and not breaking (or messing up) things. Of course, everybody can make a mistake though. It seems to be working just great, so I just wanted to share our experience. Let me know what doesn't make sense. Ondrej ___ cython-devel mailing list cython-devel@python.org http://mail.python.org/mailman/listinfo/cython-devel
[Cython] Cython sometimes fails to build on Travis
Hi, Cython sometimes fails to build on Travis for various projects. If it fails, it always ends with this error: https://gist.github.com/certik/08f16dd572170c17d956 Here are some instances of this failure in other projects: https://github.com/sympy/csympy/issues/308 https://github.com/scipy/scipy/pull/4126#issuecomment-62162812 Any ideas what is going on? Thanks, Ondrej ___ cython-devel mailing list cython-devel@python.org https://mail.python.org/mailman/listinfo/cython-devel
Re: [Cython] Cython sometimes fails to build on Travis
Hi Nathan, On Fri, Nov 7, 2014 at 3:43 PM, Nathaniel Smith wrote: > On Fri, Nov 7, 2014 at 5:13 PM, Ondrej Certik wrote: >> Hi, >> >> Cython sometimes fails to build on Travis for various projects. If it >> fails, it always ends with this error: >> >> https://gist.github.com/certik/08f16dd572170c17d956 > > I don't have any insight into the error, but for CI purposes I install > cython with: > > pip install --install-option="--no-cython-compile" cython > > which skips the compilation of cython itself (i.e. your cython code is > still translated from .pyx to .c, but the cython compiler that does > this translation runs as a pure python program). This is ridiculously > faster than a normal install -- skipping compiling cython takes > minutes off the build, which is far far far more than one loses by > making cythonization faster. This is a great suggestion! I've implemented it in https://github.com/sympy/csympy/pull/313 and it fixes all problems (and it cut testing time in half). Of course, I think there is still some underlying bug in Cython or something else, but at least as far as Travis is concerned, this is a solution for us. Thanks, Ondrej > > I mention it here because it seems like aside from being a good idea > in general, it might also serve as a workaround for whatever this > problem is. > > -n > > -- > Nathaniel J. Smith > Postdoctoral researcher - Informatics - University of Edinburgh > http://vorpus.org > ___ > cython-devel mailing list > cython-devel@python.org > https://mail.python.org/mailman/listinfo/cython-devel ___ cython-devel mailing list cython-devel@python.org https://mail.python.org/mailman/listinfo/cython-devel
