[Python-checkins] r61160 - peps/trunk/pep-0101.txt peps/trunk/pep-0361.txt

barry.warsaw python-checkins at python.org
Sat Mar 1 19:36:30 CET 2008


Author: barry.warsaw
Date: Sat Mar  1 19:36:30 2008
New Revision: 61160

Modified:
   peps/trunk/pep-0101.txt
   peps/trunk/pep-0361.txt
Log:
Updates to PEP 101 (which still needs a lot of work), and PEP 361 to
describe the joint 2.6/3.0 release schedule.


Modified: peps/trunk/pep-0101.txt
==============================================================================
--- peps/trunk/pep-0101.txt	(original)
+++ peps/trunk/pep-0101.txt	Sat Mar  1 19:36:30 2008
@@ -20,9 +20,6 @@
     recipe and you can actually print this out and check items off as
     you complete them.
 
-    XXX: This version is a partial update by Neal Norwitz.  There are
-    undoubtedly still many places where reality differs!
-
 
 How to Make A Release
 
@@ -88,10 +85,10 @@
       immediately after making the branch, or even before you've made
       the branch.
 
-      Add high level items new to this release.  E.g. if we're
-      releasing 2.6a3, there must be a section at the top of the file
-      explaining "What's new in Python 2.6a3".  It will be followed by
-      a section entitled "What's new in Python 2.6a2".
+      Add high level items new to this release.  E.g. if we're releasing
+      2.6a3, there must be a section at the top of the file explaining
+      "What's new in Python 2.6 alpha 3".  It will be followed by a
+      section entitled "What's new in Python 2.6 alpha 2".
 
       Note that you /hope/ that as developers add new features to the
       trunk, they've updated the NEWS file accordingly.  You can't be
@@ -113,7 +110,7 @@
       Lib/idlelib/NEWS.txt has been similarly updated.
 
   ___ Make sure the release date is fully spelled out in
-      Doc/commontex/boilerplate.tex (welease).
+      Doc/commontex/boilerplate.tex (welease).  BROKEN
 
   ___ Tag and/or branch the tree for release X.YaZ (welease does tagging)
 
@@ -140,6 +137,8 @@
       When making a minor release (e.g., for 2.6a1 or 2.6.1), you should tag.
       To create a _tag_ (e.g., r26a1), do the following:
 
+      DO NOT TAG UNTIL YOU"VE MADE THE NECESSARY EDITS BELOW
+
     ___ svn copy \
           svn+ssh://pythondev@svn.python.org/python/branches/release26-maint \
           svn+ssh://pythondev@svn.python.org/python/tags/r26a1
@@ -151,7 +150,7 @@
         % svn co \
             svn+ssh://pythondev@svn.python.org/python/branches/release26-maint
 
-    ___ cd relesae26-maint  # cd into the branch directory.
+    ___ cd release26-maint  # cd into the branch directory.
 
   ___ Change Include/patchlevel.h in two places, to
       reflect the new version number you've just created.  You'll want
@@ -168,16 +167,16 @@
   ___ distutils also maintains its own versioning file
       (Lib/distutils/__init__.py).  Update this file with the Python version.
 
-  ___ Change the "%define version" line of Misc/RPM/python-2.5.spec to
+  ___ Change the "%define version" line of Misc/RPM/python-X.Y.spec to
       the same string as PY_VERSION was changed to above.  E.g.
 
-       %define version 2.5.1
+       %define version 2.6a1
 
        The following line, "%define libvers", should reflect the
        major/minor number as one would usually see in the
        "/usr/lib/python<libvers>" directory name.  E.g.
 
-       %define libvers 2.5
+       %define libvers 2.6
 
        You also probably want to reset the %define release line
        to '1pydotorg' if it's not already that.
@@ -200,11 +199,11 @@
       number changes, also update the LICENSE file.
 
     ___ There's a copy of the license in
-        Doc/commontex/license.tex; the DE usually takes care of that.
+        Doc/commontex/license.tex; the DE usually takes care of that.  BROKEN
 
   ___ If the minor (middle) digit of the version number changes, update:
 
-    ___ Doc/tut/tut.tex (4 references to [Pp]ython26)
+    ___ Doc/tut/tut.tex (4 references to [Pp]ython26)  BROKEN
 
   ___ Check the years on the copyright notice.  If the last release
       was some time last year, add the current year to the copyright
@@ -218,9 +217,9 @@
 
     ___ Doc/README (at the end)
 
-    ___ Doc/commontex/copyright.tex
+    ___ Doc/commontex/copyright.tex BROKEN
 
-    ___ Doc/commontex/license.tex
+    ___ Doc/commontex/license.tex BROKEN
 
     ___ PC/python_nt.rc sets up the DLL version resource for Windows
         (displayed when you right-click on the DLL and select
@@ -228,7 +227,7 @@
 
     ___ The license.ht file for the distribution on the website
         contains what purports to be an HTML-ized copy of the LICENSE
-        file from the distribution.
+        file from the distribution.  BROKEN
 
   ___ For a final release, edit the first paragraph of
       Doc/whatsnew/whatsnewXX.tex to include the actual release date;
@@ -407,7 +406,7 @@
       the tagged branch.
 
       % cd ~
-      % svn export -rr26c2 -d Python-2.6c2 python
+      % svn export svn+ssh://pythondev@svn.python.org/python/tags/r26a1 Python-2.6c2
       (supported by welease)
 
   ___ Generate the tarballs.  Note that we're not using the `z' option
@@ -452,7 +451,7 @@
       freshly unpacked directory looks weird, you better stop now and
       figure out what the problem is.
 
-  ___ Upload the tgz file to dinsdale.python.org using scp.
+  ___ Upload the tar files to dinsdale.python.org using scp.
 
   # XXX(nnorwitz): this entire section dealing with the website is outdated.
   # The website uses SVN and the build process has changed.

Modified: peps/trunk/pep-0361.txt
==============================================================================
--- peps/trunk/pep-0361.txt	(original)
+++ peps/trunk/pep-0361.txt	Sat Mar  1 19:36:30 2008
@@ -1,5 +1,5 @@
 PEP: 361
-Title: Python 2.6 Release Schedule
+Title: Python 2.6 and 3.0 Release Schedule
 Version: $Revision$
 Last-Modified: $Date$
 Author: Neal Norwitz
@@ -7,17 +7,31 @@
 Type: Informational
 Created: 29-June-2006
 Python-Version: 2.6
+Python-Version: 3.0
 Post-History:
 
 Abstract
 
     This document describes the development and release schedule for
-    Python 2.6.  The schedule primarily concerns itself with PEP-sized
-    items.  Small features may be added up to and including the first
-    beta release.  Bugs may be fixed until the final release.
+    Python 2.6 and 3.0.  The schedule primarily concerns itself with
+    PEP-sized items.  Small features may be added up to and including
+    the first beta release.  Bugs may be fixed until the final
+    release.
 
     There will be at least two alpha releases, two beta releases, and
-    one release candidate.  The release date is planned to be in XXX 2008.
+    one release candidate.  The release date is planned to be in 2008.
+
+    Python 2.6 is not only the next advancement in the Python 2
+    series, it is also a transitionary release, helping developers
+    begin to prepare their code for Python 3.0.  As such, many
+    features are being backported from Python 3.0 to 2.6.  Thus, it
+    makes sense to release both versions in at the same time.  The
+    precedence for this was set with the Python 1.6 and 2.0 release.
+
+    During the alpha test cycle we will be releasing both versions in
+    lockstep, on a monthly release cycle.  The releases will happen on
+    the last Friday of every month.  If this schedule works well, we
+    will continue releasing in lockstep during the beta program.
 
 
 Release Manager and Crew
@@ -36,20 +50,19 @@
     betas and release candidates will be determined as the release process
     unfolds.  The minimal schedule is:
 
-        Feb 2008:  (re)confirm the crew and start deciding on schedule.
-                   The 2.6 target is for the second half of 2008.
-
-        alpha 1: T - 16 weeks [planned]
-        alpha 2: T - 13 weeks [planned]
-        beta 1:  T -  9 weeks [planned]
-        beta 2:  T -  5 weeks [planned]
-        rc 1:    T -  1 week  [planned]
-        final:   T [planned]
+        Feb 29 2008: Python 2.6a1 and 3.0a3 are released.
+        Mar 25 2008: next alpha releases planned
 
      Monthly releases for alphas are planned starting at the end of Feb 2008:
      http://mail.python.org/pipermail/python-dev/2008-February/077125.html
 
 
+Completed features for 3.0
+
+    See PEP 3000 [#pep3000] and PEP 3100 [#pep3100] for details on the
+    Python 3.0 project.
+
+
 Completed features for 2.6
 
     PEPs:
@@ -224,6 +237,12 @@
 .. [#pep367] PEP 367 (New Super)
    http://www.python.org/dev/peps/pep-0367
 
+.. [#pep3000] PEP 3000 (Python 3000)
+   http://www.python.org/dev/peps/pep-3000
+
+.. [#pep3100] PEP 3100 (Miscellaneous Python 3.0 Plans)
+   http://www.python.org/dev/peps/pep-3100
+
 .. [#pep3112] PEP 3112 (Bytes literals in Python 3000)
    http://www.python.org/dev/peps/pep-03112
 


More information about the Python-checkins mailing list