Reminder: 3.5 now has its own branch! "default" branch is now 3.6!

I've now pushed the 3.5.0 beta 1 release-engineering checkins to hg.python.org. At the same time I did this, I also created the 3.5 branch.
Quick FAQ:
Q: Where should I check in bugfixes for 3.5? A: In the "3.5" branch. You should also merge them forward into "default".
Q: Where should I check in new features for 3.5? A: You sillyhead! New features aren't allowed for 3.5 anymore, it's in feature freeze.
Q: What is "default" now? A: "default" is now 3.6. Meaning, you can now start on new features for 3.6! You don't have to wait until 3.5 final is released, like how we used to do it.
Q: What's all this about bitbucket and push requests? A: We don't start doing that until 3.5.0 release candidate 1. Don't worry about it for now. When the time comes, I'll post instructions here and to the devguide.
A new day is dawning,
//arry/

On 25.05.15 02:49, Larry Hastings wrote:
I've now pushed the 3.5.0 beta 1 release-engineering checkins to hg.python.org. At the same time I did this, I also created the 3.5 branch.
Quick FAQ:
Q: Where should I check in bugfixes for 3.5? A: In the "3.5" branch. You should also merge them forward into "default".
Q: Where should I check in new features for 3.5? A: You sillyhead! New features aren't allowed for 3.5 anymore, it's in feature freeze.
Q: What is "default" now? A: "default" is now 3.6. Meaning, you can now start on new features for 3.6! You don't have to wait until 3.5 final is released, like how we used to do it.
Perhaps needed version bump in the default branch? I think now Misc/NEWS will have two modifiable sections - for 3.5 (bugfixes) and for 3.6 (new features).

On 05/25/2015 02:03 AM, Serhiy Storchaka wrote:
Perhaps needed version bump in the default branch? I think now Misc/NEWS will have two modifiable sections - for 3.5 (bugfixes) and for 3.6 (new features).
That's a good point! I've added a "3.6.0 alpha 1" section as you suggest.
That suggests more FAQs:
Q: When I check in just to the default branch (3.6), where should I put my news items in Misc/NEWS? A: There's a section for "3.6.0 alpha 1", put them there.
Q: When I check in to 3.5 and merge into to the default branch, where should I put my news items in Misc/NEWS? A: It should go in the same section (3.5.0 beta 1, beta 2, rc 1, etc).
I suspect I'll still have to do some cleanup in Misc/NEWS when we ship 3.5.0 final. Isn't it always the way!
//arry/

On Mon, May 25, 2015 at 3:10 PM, Larry Hastings <larry@hastings.org> wrote:
On 05/25/2015 02:03 AM, Serhiy Storchaka wrote:
Perhaps needed version bump in the default branch? I think now Misc/NEWS will have two modifiable sections - for 3.5 (bugfixes) and for 3.6 (new features).
That's a good point! I've added a "3.6.0 alpha 1" section as you suggest.
Should probably also actually bump the version (default still says it's 3.5.0b1: "Python 3.5.0b1+ (default:cf7e905ef5dd+, May 25 2015, 15:34:05)").
-- Zach

On 05/25/2015 01:37 PM, Zachary Ware wrote:
Should probably also actually bump the version (default still says it's 3.5.0b1: "Python 3.5.0b1+ (default:cf7e905ef5dd+, May 25 2015, 15:34:05)"). -- Zach
Another good point! I checked with Benjamin and set it to the proper value ("Python 3.6.0a0").
//arry/
participants (3)
-
Larry Hastings
-
Serhiy Storchaka
-
Zachary Ware