<div class="gmail_quote">On Fri, Aug 31, 2012 at 6:06 AM, Matthew Turk <span dir="ltr"><<a href="mailto:matthewturk@gmail.com" target="_blank">matthewturk@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi all,<br>
<br>
Okay, looks like everybody's pretty much in favor. Anthony, would it<br>
be possible to run the script on the tip of the 2.x repository and<br>
issue a PR for that?</blockquote><div><br></div><div>Yup, I'll do so within the next hour or so,</div><div><br></div><div>Be Well</div><div>Anthony</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
And, do we want to merge to stable so that any<br>
big bug fixes get applied there before doing so?<br>
<br>
-Matt<br>
<div class="HOEnZb"><div class="h5"><br>
On Mon, Aug 27, 2012 at 2:30 PM, Matthew Turk <<a href="mailto:matthewturk@gmail.com">matthewturk@gmail.com</a>> wrote:<br>
> Nearly everyone who has replied so far is on board with the third<br>
> option, which is to apply the same change to both. Anthony and Kacper<br>
> also had a discussion in the PR about the cosmology routines, which<br>
> seem to be (!!!) non-functional in some particular configurations of<br>
> the universe. I'll suggest that we wait until Wednesday, and if<br>
> nobody objects by then, we accept this PR and then also a similar one<br>
> for the dev branch. I'd prefer we not apply these changes to the<br>
> stable branch at this time.<br>
><br>
> In IRC, Martin Geisler also pointed me at these StackOverflow<br>
> questions which address merges and workflows like this:<br>
><br>
> <a href="http://stackoverflow.com/a/9533927/110204" target="_blank">http://stackoverflow.com/a/9533927/110204</a><br>
> <a href="http://stackoverflow.com/a/9500764/110204" target="_blank">http://stackoverflow.com/a/9500764/110204</a><br>
><br>
> In short, by applying to both, we're going to be okay. :)<br>
><br>
> -Matt<br>
><br>
> On Mon, Aug 27, 2012 at 1:47 PM, Anthony Scopatz <<a href="mailto:scopatz@gmail.com">scopatz@gmail.com</a>> wrote:<br>
>> Hello All,<br>
>><br>
>> Obviously, I am +1 for #3 and +0 on #2 (no need to create a maintenance<br>
>> headache if you don't have to). I originally did this in the 3.0 fork just<br>
>> because<br>
>> I thought it was more of a sandbox than the 2.x series. I am also +0 on #1,<br>
>> if that is what is best.<br>
>><br>
>> Be Well<br>
>> Anthony<br>
>><br>
>><br>
>> On Mon, Aug 27, 2012 at 9:54 AM, Kacper Kowalik <<a href="mailto:xarthisius.kk@gmail.com">xarthisius.kk@gmail.com</a>><br>
>> wrote:<br>
>>><br>
>>> On <a href="tel:27.08.2012%2016" value="+12708201216">27.08.2012 16</a>:08, Matthew Turk wrote:<br>
>>> > Because this could be disruptive for any major, outstanding forks, I<br>
>>> > also think it needs to be discussed here. (I'm actually kind of -1 on<br>
>>> > big discussions happening in pull requests.) My vote is for #3. I'd<br>
>>> > rather get this over with, since we all know it probably ought to<br>
>>> > happen at some point in the future.<br>
>>><br>
>>> Hi,<br>
>>> there's a way to minimize the disruption on any outstanding forks,<br>
>>> namely to automate the process. If we use the same "tool" on both main<br>
>>> repo and the fork, the difference should be close to none.<br>
>>> In this case something along the lines:<br>
>>><br>
>>> find . -name "*.py" \<br>
>>> -exec sed -e "s/\([[:punct:]]\|[[:space:]]\)na\./\1np\./g" \<br>
>>> -e "s/numpy as na/numpy as np/g" -i {} \;<br>
>>><br>
>>> should do the trick. I haven't check yet if that reproduces Anthony's PR<br>
>>> so use it carefully ;)<br>
>>> Cheers,<br>
>>> Kacper<br>
>>><br>
>>><br>
>>><br>
>>> _______________________________________________<br>
>>> yt-dev mailing list<br>
>>> <a href="mailto:yt-dev@lists.spacepope.org">yt-dev@lists.spacepope.org</a><br>
>>> <a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
>>><br>
>><br>
>><br>
>> _______________________________________________<br>
>> yt-dev mailing list<br>
>> <a href="mailto:yt-dev@lists.spacepope.org">yt-dev@lists.spacepope.org</a><br>
>> <a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
>><br>
_______________________________________________<br>
yt-dev mailing list<br>
<a href="mailto:yt-dev@lists.spacepope.org">yt-dev@lists.spacepope.org</a><br>
<a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
</div></div></blockquote></div><br>