Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-31 Thread Benjamin Peterson
2011/5/31 "Martin v. Löwis" :
> Am 30.05.2011 23:36, schrieb Benjamin Peterson:
>> 2011/5/30 Victor Stinner :
>>> Le dimanche 29 mai 2011 22:55:17, Benjamin Peterson a écrit :
 Hi,
 I'm going to start spinning those releases now. I'll make a branch for
 2.7.2 but not for 3.1.4. Please stop committing to 3.1; it's going
 into security only mode.
>>>
>>> I would like to commit something into the 2.7 branch. The NEWS file starts
>>> with:
>>>
>>> What's New in Python 2.7.2?
>>> ===
>>>
>>> *Release date: 2011-05-29*
>>>
>>> Python 2.7.2 was released yesterday, or was it the RC1?
>>>
>>> I don't care if my commit (better fix for #1195) doesn't go into Python 
>>> 2.7.2,
>>> so should I start an empty "Python 2.7.3" section?
>>
>> Yes, go ahead.
>
> Really??? I have some changes that I need to commit to 2.7 that do need
> to go into 2.7.2. So how are you going to manage these?

I have a release branch from the 2.7.2rc1. It's currently, local, but
I will push it (when I get to a computer with my .ssh keys), so you
can apply any changes you need to it. Then after 2.7.2, I will merge
it to the 2.7 branch.

>
> I rather recommend that the 2.7 branch is frozen until the final
> release, and any changes are only merged afterwards.




-- 
Regards,
Benjamin
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-31 Thread Matthias Klose

On 05/31/2011 07:19 AM, "Martin v. Löwis" wrote:
> Really??? I have some changes that I need to commit to 2.7 that do need
> to go into 2.7.2. So how are you going to manage these?
>
> I rather recommend that the 2.7 branch is frozen until the final
> release, and any changes are only merged afterwards.
>
> This is a mess.

two more questions:

 - How do I follow the "what will become the release" branch?
   In the past, you could just do an svn update on the branch
   at any time, but now this is different for development and
   freeze mode.

 - What do the buildd's test in freeze mode?  It would be bad
   to only test the branch, which doesn't see any changes.

Thanks, Matthias
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-31 Thread Victor Stinner
Le mardi 31 mai 2011 07:19:54, Martin v. Löwis a écrit :
> >> What's New in Python 2.7.2?
> >> ===
> >> 
> >> *Release date: 2011-05-29*
> >> 
> >> Python 2.7.2 was released yesterday, or was it the RC1?
> >> 
> >> I don't care if my commit (better fix for #1195) doesn't go into Python
> >> 2.7.2, so should I start an empty "Python 2.7.3" section?
> > 
> > Yes, go ahead.
> 
> Really??? I have some changes that I need to commit to 2.7 that do need
> to go into 2.7.2. So how are you going to manage these?
> 
> I rather recommend that the 2.7 branch is frozen until the final
> release, and any changes are only merged afterwards.
> 
> This is a mess.

I did 3 commits in the 2.7 branch. There are all bugfixes, so you can add them 
to 2.7.2, but I proposed to skip them to not add too much new code between 
2.7.2 RC/final versions.

I don't know how the release managers work, but if it's possible, I would 
prefer to be able to continue to commit any change to all branches during the 
release process. I mean that we should create a branch for each x.y.z version, 
and only port critical bugfixes to these branches between the RC and the final 
versions.


http://hg.python.org/cpython/rev/3b1b06570cf9
changeset:   70534:3b1b06570cf9
branch:  2.7
parent:  70509:439396b06416
user:Victor Stinner 
date:Mon May 30 23:44:13 2011 +0200
summary:
  Issue #12016: my_fgets() now always clears errors before calling fgets(). 
Fix
the following case: sys.stdin.read() stopped with CTRL+d (end of file),
raw_input() interrupted by CTRL+c.


http://hg.python.org/cpython/rev/b40dac6390a9
changeset:   70537:b40dac6390a9
branch:  2.7
parent:  70534:3b1b06570cf9
user:Victor Stinner 
date:Mon May 30 23:49:13 2011 +0200
summary:
  Issue #1195: fix the issue number of the NEWS entry


http://hg.python.org/cpython/rev/6c6923a406df
changeset:   70540:6c6923a406df
branch:  2.7
parent:  70537:b40dac6390a9
user:Victor Stinner 
date:Mon May 30 23:58:21 2011 +0200
summary:
  Issue #12057: Add tests for ISO 2022 codecs

iso2022_jp, iso2022_jp_2 and iso2022_kr


Victor
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-30 Thread Ned Deily
In article <4de47a7a.1060...@v.loewis.de>,
 "Martin v. Löwis"  wrote:
> Am 30.05.2011 23:36, schrieb Benjamin Peterson:
> > 2011/5/30 Victor Stinner :
> >> Le dimanche 29 mai 2011 22:55:17, Benjamin Peterson a écrit :
> >>> Hi,
> >>> I'm going to start spinning those releases now. I'll make a branch for
> >>> 2.7.2 but not for 3.1.4. Please stop committing to 3.1; it's going
> >>> into security only mode.
> >>
> >> I would like to commit something into the 2.7 branch. The NEWS file starts
> >> with:
> >>
> >> What's New in Python 2.7.2?
> >> ===
> >>
> >> *Release date: 2011-05-29*
> >>
> >> Python 2.7.2 was released yesterday, or was it the RC1?
> >>
> >> I don't care if my commit (better fix for #1195) doesn't go into Python 
> >> 2.7.2,
> >> so should I start an empty "Python 2.7.3" section?
> > 
> > Yes, go ahead.
> 
> Really??? I have some changes that I need to commit to 2.7 that do need
> to go into 2.7.2. So how are you going to manage these?
> 
> I rather recommend that the 2.7 branch is frozen until the final
> release, and any changes are only merged afterwards.

I would think the easiest approach is to have a 2.7.2 releasing branch 
where changes for 2.7.2 are applied and immediately merged into the main 
2.7 branch.  It's trivial to create such a branch off of the 2.7.2rc1 
tag but (I think) you wouldn't be able to push the resulting repo into 
the main repo because it creates a new head. and there's a hook to 
prevent that.  Someone would have to create it specially.

-- 
 Ned Deily,
 n...@acm.org

___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-30 Thread Martin v. Löwis
Am 30.05.2011 23:36, schrieb Benjamin Peterson:
> 2011/5/30 Victor Stinner :
>> Le dimanche 29 mai 2011 22:55:17, Benjamin Peterson a écrit :
>>> Hi,
>>> I'm going to start spinning those releases now. I'll make a branch for
>>> 2.7.2 but not for 3.1.4. Please stop committing to 3.1; it's going
>>> into security only mode.
>>
>> I would like to commit something into the 2.7 branch. The NEWS file starts
>> with:
>>
>> What's New in Python 2.7.2?
>> ===
>>
>> *Release date: 2011-05-29*
>>
>> Python 2.7.2 was released yesterday, or was it the RC1?
>>
>> I don't care if my commit (better fix for #1195) doesn't go into Python 
>> 2.7.2,
>> so should I start an empty "Python 2.7.3" section?
> 
> Yes, go ahead.

Really??? I have some changes that I need to commit to 2.7 that do need
to go into 2.7.2. So how are you going to manage these?

I rather recommend that the 2.7 branch is frozen until the final
release, and any changes are only merged afterwards.

This is a mess.

Regards,
Martin
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-30 Thread Benjamin Peterson
2011/5/30 Victor Stinner :
> Le dimanche 29 mai 2011 22:55:17, Benjamin Peterson a écrit :
>> Hi,
>> I'm going to start spinning those releases now. I'll make a branch for
>> 2.7.2 but not for 3.1.4. Please stop committing to 3.1; it's going
>> into security only mode.
>
> I would like to commit something into the 2.7 branch. The NEWS file starts
> with:
>
> What's New in Python 2.7.2?
> ===
>
> *Release date: 2011-05-29*
>
> Python 2.7.2 was released yesterday, or was it the RC1?
>
> I don't care if my commit (better fix for #1195) doesn't go into Python 2.7.2,
> so should I start an empty "Python 2.7.3" section?

Yes, go ahead.


-- 
Regards,
Benjamin
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-30 Thread Victor Stinner
Le dimanche 29 mai 2011 22:55:17, Benjamin Peterson a écrit :
> Hi,
> I'm going to start spinning those releases now. I'll make a branch for
> 2.7.2 but not for 3.1.4. Please stop committing to 3.1; it's going
> into security only mode.

I would like to commit something into the 2.7 branch. The NEWS file starts 
with:

What's New in Python 2.7.2?
===

*Release date: 2011-05-29*

Python 2.7.2 was released yesterday, or was it the RC1?

I don't care if my commit (better fix for #1195) doesn't go into Python 2.7.2, 
so should I start an empty "Python 2.7.3" section?

Victor
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-29 Thread Eli Bendersky
>> Just to be sure, you mean the 3.1.4 will be the last bugfix release? 3.1.5 
>> will
>> be security fix only? So for example, as Python 2.6, doc updates are no more
>> accepted in 3.1?
>
> Correct.
>

That's great. Shorter pull dances for all :)

Eli
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-29 Thread Benjamin Peterson
2011/5/29 Victor Stinner :
> Le dimanche 29 mai 2011 22:55:17, Benjamin Peterson a écrit :
>> Hi,
>> I'm going to start spinning those releases now. I'll make a branch for
>> 2.7.2 but not for 3.1.4. Please stop committing to 3.1; it's going
>> into security only mode.
>
> Just to be sure, you mean the 3.1.4 will be the last bugfix release? 3.1.5 
> will
> be security fix only? So for example, as Python 2.6, doc updates are no more
> accepted in 3.1?

Correct.



-- 
Regards,
Benjamin
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


Re: [python-committers] 2.7.2 and 3.1.4 rc now

2011-05-29 Thread Victor Stinner
Le dimanche 29 mai 2011 22:55:17, Benjamin Peterson a écrit :
> Hi,
> I'm going to start spinning those releases now. I'll make a branch for
> 2.7.2 but not for 3.1.4. Please stop committing to 3.1; it's going
> into security only mode.

Just to be sure, you mean the 3.1.4 will be the last bugfix release? 3.1.5 will 
be security fix only? So for example, as Python 2.6, doc updates are no more 
accepted in 3.1?

Victor
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers


[python-committers] 2.7.2 and 3.1.4 rc now

2011-05-29 Thread Benjamin Peterson
Hi,
I'm going to start spinning those releases now. I'll make a branch for
2.7.2 but not for 3.1.4. Please stop committing to 3.1; it's going
into security only mode.

-- 
Regards,
Benjamin
___
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers