[Python-checkins] CVS: python/nondist/peps pep-0101.txt,1.9,1.10
Barry Warsaw
bwarsaw@users.sourceforge.net
2001年10月24日 16:18:48 -0700
Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv25937
Modified Files:
pep-0101.txt
Log Message:
Updates based on final decision about the inclusion of Doc/ in the
source tarball (we do it), a compromise on when the branch is created,
and some information about the Mac.
Also, added some underlines for actual tick marks.
Index: pep-0101.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0101.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pep-0101.txt 2001年10月22日 19:00:55 1.9
--- pep-0101.txt 2001年10月24日 23:18:46 1.10
***************
*** 17,21 ****
Guido himself. But several recent releases have been performed by
other folks, so this PEP attempts to collect, in one place, all
! the steps needed to make a Python release.
--- 17,23 ----
Guido himself. But several recent releases have been performed by
other folks, so this PEP attempts to collect, in one place, all
! the steps needed to make a Python release. It is organized as a
! recipe and you can actually print this out and check items off as
! you complete them.
***************
*** 28,33 ****
Otherwise, assume the step is done by the Release Manager (RM),
the designated person performing the release. Almost every place
! the RM is mentioned below, this step can also be done by Guido,
! naturally!
XXX: We should include a dependency graph to illustrate the steps
--- 30,35 ----
Otherwise, assume the step is done by the Release Manager (RM),
the designated person performing the release. Almost every place
! the RM is mentioned below, this step can also be done by the BDFL
! of course!
XXX: We should include a dependency graph to illustrate the steps
***************
*** 41,73 ****
used, then we'll say X.Y.MaZ.
! - A day or two before the release, create a branch for X.YaZ.
! All Python development happens on the trunk. A few days before
! the release, the RM will create a branch for this release. Only
! the RM is authorized to make commits to this branch, but
! check ins can proceed as normal on the trunk. It is the
! responsibility of the RM to decide on a case-by-case basis which
! trunk modifications should be merged into the branch.
To create a branch the following steps are taken:
! * Do a CVS update with the -A flag, e.g.
% cvs update -A
! * CVS tag the trunk with the symbolic name "rXYaZ-fork", e.g.
% cvs tag r22a3-fork
! * Make the branch with the symbolic name "rXYaZ-branch", e.g.
% cvs tag -b r22a3-branch
! * Check out a clean version of the branch into a new directory.
You'll be doing a lot of work in this directory and you want
to keep it straight from your trunk working directory. E.g.
% cvs -d <cvsroot> -q co -d python-22a3 -r r22a3-branch python/dist/src
! - Send an email to python-dev@python.org indicating the fork and
branch tags you've just created.
! - Put a freeze on check ins into the branch. At this point,
nobody except the RM should make any commits to the branch (or
his duly assigned agents, i.e. Guido the BDFL, Fred Drake for
--- 43,95 ----
used, then we'll say X.Y.MaZ.
! ___ At noon the day before the release, create a branch for X.YaZ.
! All Python development happens on the trunk. Making releases
! from a branch allows development by the community to continue
! without impacting what ends up in the release. There's a
! natural tension here though: branching too soon causes headaches
! when the branch has to be merged back into the trunk, while
! branching too late can cause dependency problems with
! documentation and Windows release steps.
!
! The compromise is to create the branch at noon, local time, the
! day before the release. This should give enough time to Fred to
! make the documentation, then for Tim to create the Windows
! installer, both of which need to happen before the release can
! be announced. It's also short enough that hopefully not too
! many trunk changes will need to be merged into the branch, or
! vice versa.
+ Once the branch is made, only the RM or his appointed bots are
+ allowed to make commits to the branch. You can assume that Fred
+ is a bot for the Doc/ tree, Tim is a bot for the Windows stuff,
+ and Jack is a bot for Mac stuff.
+
+ Anyone can continue to make checkins on the trunk, but if such a
+ change should be merged into the branch, the committer must
+ indicate this in the checkin message. It is the responsibility
+ of the RM to decide on a case-by-case basis which trunk
+ modifications should be merged into the branch.
+
To create a branch the following steps are taken:
! ___ Do a CVS update with the -A flag, e.g.
% cvs update -A
! ___ CVS tag the trunk with the symbolic name "rXYaZ-fork", e.g.
% cvs tag r22a3-fork
! ___ Make the branch with the symbolic name "rXYaZ-branch", e.g.
% cvs tag -b r22a3-branch
! ___ Check out a clean version of the branch into a new directory.
You'll be doing a lot of work in this directory and you want
to keep it straight from your trunk working directory. E.g.
% cvs -d <cvsroot> -q co -d python-22a3 -r r22a3-branch python/dist/src
! ___ Send an email to python-dev@python.org indicating the fork and
branch tags you've just created.
! ___ Put a freeze on check ins into the branch. At this point,
nobody except the RM should make any commits to the branch (or
his duly assigned agents, i.e. Guido the BDFL, Fred Drake for
***************
*** 77,89 ****
avoid this!
! - In the branch, change Include/patchlevel.h in two places, to
reflect the new version number you've just created. You'll want
to change the PY_VERSION macro, and one or several of the
version subpart macros just above PY_VERSION, as appropriate.
! - For the next few days, selectively merge stuff from trunk into
! branch. For each change you see on the trunk (i.e. via the
! python-checkins mailing list), you need to decide whether the
! change should also be applied to the branch.
If so, it's fairly easy to apply the change by diff'ing the file
--- 99,115 ----
avoid this!
! ___ In the branch, change Include/patchlevel.h in two places, to
reflect the new version number you've just created. You'll want
to change the PY_VERSION macro, and one or several of the
version subpart macros just above PY_VERSION, as appropriate.
! ___ For the next approximately 20 hours or so, selectively merge
! stuff from trunk into branch. For each change you see on the
! trunk (i.e. via the python-checkins mailing list), you need to
! decide whether the change should also be applied to the branch.
!
! Note that committers of changes to the trunk SHOULD include a
! in the checkin message, a note indicating the suitability of
! their patch for the branch.
If so, it's fairly easy to apply the change by diff'ing the file
***************
*** 93,98 ****
exist in the branch!
! - The night before the release, the RM updates the Misc/NEWS file,
! adding high level items new to this release. E.g. if we're
releasing 2.2a3, there must be a section at the top of the file
explaining "What's new in Python 2.2a3". It will be followed by
--- 119,129 ----
exist in the branch!
! ___ After creating the branch, the most important thing to do next
! is to update the Misc/NEWS file. Tim will need this in order to
! do the Windows release and he likes to stay up late. This step
! can be pretty tedious, so it's best to get to it immediately
! after making the branch.
!
! Add high level items new to this release. E.g. if we're
releasing 2.2a3, there must be a section at the top of the file
explaining "What's new in Python 2.2a3". It will be followed by
***************
*** 105,109 ****
about changes on the Mac.
! - Once the branch is frozen, Fred Drake needs to create the HTML
from the documentation. He does this and uploads the file to
www.python.org. Then he tells Tim Peters where this file is.
--- 136,140 ----
about changes on the Mac.
! ___ Once the branch is frozen, Fred Drake needs to create the HTML
from the documentation. He does this and uploads the file to
www.python.org. Then he tells Tim Peters where this file is.
***************
*** 114,118 ****
Info format.
! - Tim Peters grabs the HTML and uses this to build the Windows
installer. Tim then creates a new "release" named X.YaZ on the
SourceForge file release manager.
--- 145,154 ----
Info format.
! Note that Fred is responsible both for merging doc changes from
! the trunk to the branch AND for merging any branch changes from
! the branch to the trunk during the cleaning up phase.
! Basically, if it's in Doc/ Fred will take care of it.
!
! ___ Tim Peters grabs the HTML and uses this to build the Windows
installer. Tim then creates a new "release" named X.YaZ on the
SourceForge file release manager.
***************
*** 130,134 ****
number.
! - Tim performs his Windows magic, generating an installer
executable. He uploads this file to SourceForge under the
release he just created. He then sends the RM a notice which
--- 166,170 ----
number.
! ___ Tim performs his Windows magic, generating an installer
executable. He uploads this file to SourceForge under the
release he just created. He then sends the RM a notice which
***************
*** 136,170 ****
Note that Tim's creation of the Windows executable may generate
! a few more commits on the branch.
! - Now, you're ready to build the source tarball. First cd to your
working directory for the branch. E.g.
% cd .../python-22a3
! - Do a "cvs update" in this directory. You should not see any "M"
! files, but you may see several "P" files. I.e. you better not
! have any uncommitted changes in your working directory, but you
! may pick up some of Fred's or Tim's last minute changes.
! - Now tag the branch using a symbolic name like "rXYaZ",
e.g. r22a3
% cvs tag r22a3
! - Change to a neutral directory, i.e. one in which you can do a
! fresh, virgin, export of the branch. You will be creating a new
! directory at this location, to be named "Python-X.YaZ". Do a
! CVS export of the tagged branch.
% cd ~
% cvs -d <cvsroot> export -rr22a3 -d Python-2.2a3 python/dist/src
-
- - Remove the documentation sources from the export; these are only
- useful to people who have LaTeX and possibly several other tools
- installed (how many tools are required depends on the
- documentation format you want to end up with). These also add
- substantially to the size of the resulting archive (almost a
- megabyte for Python 2.2).
- % rm -r Python-.2a3/Doc/
! - Generate the tarball. Note that we're not using the `z' option
on the tar command because 1) that's only supported by GNU tar
as far as we know, and 2) we're going to max out the compression
--- 172,205 ----
Note that Tim's creation of the Windows executable may generate
! a few more commits on the branch. Tim will be responsible for
! merging Windows-specific changes from trunk to branch, and from
! branch to trunk.
! ___ It's Noon!
!
! Now, you're ready to build the source tarball. First cd to your
working directory for the branch. E.g.
% cd .../python-22a3
! ___ Do a "cvs update" in this directory. Do NOT include the -A flag!
! You should not see any "M" files, but you may see several "P"
! files. I.e. you better not have any uncommitted changes in your
! working directory, but you may pick up some of Fred's or Tim's
! last minute changes.
!
! ___ Now tag the branch using a symbolic name like "rXYaZ",
e.g. r22a3
% cvs tag r22a3
! ___ Change to a neutral directory, i.e. one in which you can do a
! fresh, virgin, cvs export of the branch. You will be creating a
! new directory at this location, to be named "Python-X.YaZ". Do
! a CVS export of the tagged branch.
!
% cd ~
% cvs -d <cvsroot> export -rr22a3 -d Python-2.2a3 python/dist/src
! ___ Generate the tarball. Note that we're not using the `z' option
on the tar command because 1) that's only supported by GNU tar
as far as we know, and 2) we're going to max out the compression
***************
*** 172,176 ****
% tar cf - Python-2.2a2 | gzip -9 > Python-2.2a2.tgz
! - Calculate the MD5 checksum of the tgz file you just created
% md5sum Python-2.2a2.tgz
--- 207,211 ----
% tar cf - Python-2.2a2 | gzip -9 > Python-2.2a2.tgz
! ___ Calculate the MD5 checksum of the tgz file you just created
% md5sum Python-2.2a2.tgz
***************
*** 178,182 ****
Python replacement in the Tools/scripts/md5sum.py file.
! - Now you want to perform the very important step of checking the
tarball you just created, to make sure a completely clean,
virgin build passes the regression test. Here are the best
--- 213,217 ----
Python replacement in the Tools/scripts/md5sum.py file.
! ___ Now you want to perform the very important step of checking the
tarball you just created, to make sure a completely clean,
virgin build passes the regression test. Here are the best
***************
*** 194,202 ****
If the tests pass, then you can feel good that the tarball is
! fine. If some of the tests pass, or anything else about the
freshly unpacked directory looks weird, you better stop now and
figure out what the problem is.
! - Start your upload to SF. You need to get Python-2.2a3.tgz into
SourceForge. This can take a while both because of the time it
takes to upload such a huge file, /and/ because SF has a 30
--- 229,237 ----
If the tests pass, then you can feel good that the tarball is
! fine. If some of the tests fail, or anything else about the
freshly unpacked directory looks weird, you better stop now and
figure out what the problem is.
! ___ Start your upload to SF. You need to get Python-2.2a3.tgz into
SourceForge. This can take a while both because of the time it
takes to upload such a huge file, /and/ because SF has a 30
***************
*** 208,212 ****
you have it available. You can execute the following command to
do the upload:
! % ncftpput -F upload.sf.net incoming Python-2.2a3.tgz
If you don't have ncftpput around, you can use whatever ftp
--- 243,247 ----
you have it available. You can execute the following command to
do the upload:
! % ncftpput upload.sf.net incoming Python-2.2a3.tgz
If you don't have ncftpput around, you can use whatever ftp
***************
*** 214,218 ****
uploading this to the "incoming" directory on upload.sf.net.
! - You also need to upload the tgz file to creosote.python.org.
Usually Tim will have already uploaded the exe file to creosote,
but if not, you'll need to do that too. These steps can take a
--- 249,253 ----
uploading this to the "incoming" directory on upload.sf.net.
! ___ You also need to upload the tgz file to creosote.python.org.
Usually Tim will have already uploaded the exe file to creosote,
but if not, you'll need to do that too. These steps can take a
***************
*** 230,237 ****
done if you're on a small pipe.
! - While you're waiting, you can start twiddling the web pages to
include the announcement.
! * In the python.org web site CVS tree, cd to the X.Y
subdirectory, and copy index.ht to new-index.ht
--- 265,274 ----
done if you're on a small pipe.
! I usually opt for #2.
!
! ___ While you're waiting, you can start twiddling the web pages to
include the announcement.
! ___ In the python.org web site CVS tree, cd to the X.Y
subdirectory, and copy index.ht to new-index.ht
***************
*** 239,243 ****
% cp index.ht new-index.ht
! * Edit the file for content: usually you can globally replace
X.Ya(Z-1) with X.YaZ. However, you'll need to think about the
"What's New?" section. You also need to watch out about two
--- 276,280 ----
% cp index.ht new-index.ht
! ___ Edit the file for content: usually you can globally replace
X.Ya(Z-1) with X.YaZ. However, you'll need to think about the
"What's New?" section. You also need to watch out about two
***************
*** 248,257 ****
below. For now just note what needs to change.
! Also, update the MD5 checksums.
! * Preview the web page by doing a "make" -- NOT a "make install".
View the page via a file: url.
! * Similarly, edit the ../index.ht file, i.e. the python.org home
page. In the Big Blue Announcement Block, move the paragraph
for the new version up to the top and boldify the phrase
--- 285,294 ----
below. For now just note what needs to change.
! ___ Also, update the MD5 checksums.
! ___ Preview the web page by doing a "make" -- NOT a "make install".
View the page via a file: url.
! ___ Similarly, edit the ../index.ht file, i.e. the python.org home
page. In the Big Blue Announcement Block, move the paragraph
for the new version up to the top and boldify the phrase
***************
*** 259,278 ****
above. Do NOT do a "make install" yet!
! - Now we're waiting for the ncftpput command, and the scp to
creosote to finish. Da de da, da de dum, hmm, hmm, dum de dum.
! - Do the SourceForge file release dance.
! * Go to the Python project and click on "Admin"
! * Click on "Edit/Release Files"
! * Since Tim has usually by now created the package and release
we're going to use, scroll down and click on "Edit Releases"
for the package we're releasing into.
! * Find the release named X.YaZ and click on "Edit This Release"
You should now perform Step 1 of the file release dance...
! * The "Status" field should be "Active" not "Hidden"
! * In the text box that says "Paste The Notes In", paste in all
the "What's New" entries from the Misc/NEWS file that describe
this major version of Python, /not/ just the ones for this
--- 296,315 ----
above. Do NOT do a "make install" yet!
! ___ Now we're waiting for the ncftpput command, and the scp to
creosote to finish. Da de da, da de dum, hmm, hmm, dum de dum.
! ___ Do the SourceForge file release dance.
! ___ Go to the Python project and click on "Admin"
! ___ Click on "Edit/Release Files"
! ___ Since Tim has usually by now created the package and release
we're going to use, scroll down and click on "Edit Releases"
for the package we're releasing into.
! ___ Find the release named X.YaZ and click on "Edit This Release"
You should now perform Step 1 of the file release dance...
! ___ The "Status" field should be "Active" not "Hidden"
! ___ In the text box that says "Paste The Notes In", paste in all
the "What's New" entries from the Misc/NEWS file that describe
this major version of Python, /not/ just the ones for this
***************
*** 280,286 ****
we'd include the "What's New" sections for Python 2.2a3,
2.2a2, and 2.2a1.
! * Leave the "Paste The Change Log In" section blank, but click
on "Preserve my pre-formatted text".
! * Hit the Submit/Refresh button for Step 1.
This will bring you back to the file release page. DO NOT do
--- 317,323 ----
we'd include the "What's New" sections for Python 2.2a3,
2.2a2, and 2.2a1.
! ___ Leave the "Paste The Change Log In" section blank, but click
on "Preserve my pre-formatted text".
! ___ Hit the Submit/Refresh button for Step 1.
This will bring you back to the file release page. DO NOT do
***************
*** 288,292 ****
is, you can perform Step 2 of the file release dance...
! * Click on the checkbox next to the file Python-X.YaZ.tgz. Be
sure no other box is checked! Then click on the "Add Files
and/or Refresh View" button for Step 2.
--- 325,329 ----
is, you can perform Step 2 of the file release dance...
! ___ Click on the checkbox next to the file Python-X.YaZ.tgz. Be
sure no other box is checked! Then click on the "Add Files
and/or Refresh View" button for Step 2.
***************
*** 294,304 ****
And now, Step 3...
! * There should be exactly two files listed here, one is the tgz
file you just added, and the other is the exe file that Tim
added earlier.
! * For the tgz file, be sure that the "Processor" field says
"Any" and the "File Type" field says "Source .gz".
! * Click on "Update/Refresh" for the .tgz file.
! * For the exe file, make sure that the "Processor" field says
"i386" and the "File Type" field says "Other". Tim usually
gets this right <wink>, but if not, make any necessary changes
--- 331,341 ----
And now, Step 3...
! ___ There should be exactly two files listed here, one is the tgz
file you just added, and the other is the exe file that Tim
added earlier.
! ___ For the tgz file, be sure that the "Processor" field says
"Any" and the "File Type" field says "Source .gz".
! ___ Click on "Update/Refresh" for the .tgz file.
! ___ For the exe file, make sure that the "Processor" field says
"i386" and the "File Type" field says "Other". Tim usually
gets this right <wink>, but if not, make any necessary changes
***************
*** 310,314 ****
announcement to send the SF email notice.
! - Still on SF, click on the "Files" button at the top of the
page. Find the release you've just made and click on it -- not
on the tgz or exe file, but on the release link under the
--- 347,351 ----
announcement to send the SF email notice.
! ___ Still on SF, click on the "Files" button at the top of the
page. Find the release you've just made and click on it -- not
on the tgz or exe file, but on the release link under the
***************
*** 322,326 ****
"shownotes" link mentioned earlier.
! - Now click on the "Summary" link at the top of the page and
scroll down to the "Latest File Releases" section. Find the
package you just made a release for (the Version should be
--- 359,363 ----
"shownotes" link mentioned earlier.
! ___ Now click on the "Summary" link at the top of the page and
scroll down to the "Latest File Releases" section. Find the
package you just made a release for (the Version should be
***************
*** 333,337 ****
"showfiles" link mentioned earlier.
! - Now you need to go to creosote.python.org and move all the files
in place over there. Our policy is that every Python version
gets its own directory, but each directory may contain several
--- 370,374 ----
"showfiles" link mentioned earlier.
! ___ Now you need to go to creosote.python.org and move all the files
in place over there. Our policy is that every Python version
gets its own directory, but each directory may contain several
***************
*** 345,373 ****
So...
! * On creosote, cd to ~ftp/pub/python/X.Y creating it if
necessary.
! * Move the previous release files to a directory called "prev"
creating the directory if necessary (make sure the directory
has g+ws bits on). If this is the first alpha release of a
new Python version, skip this step.
! * Move the .tgz file and the .exe file to this directory. Make
sure they are world readable. They should also be group
writable, and group-owned by webmaster.
! - Update the X.Y/bugs.ht file if necessary. You may need to get
BDFL input for this step.
! - Now preview the new-index.ht file once more. IMPORTANT: follow
every link on the page to make sure it goes where you expect it
to go, and that what you expect to be there is there.
! - If everything looks good, move new-index.ht to index.ht and do a
"make install" in this directory. Go up to the parent directory
(i.e. the root of the web page hierarchy) and do a "make
install" there too. You're release is now live!
! - Now it's time to write the announcement for the mailing lists.
This is the fuzzy bit because not much can be automated. You
can use one of Guido's earlier announcements as a template, but
--- 382,410 ----
So...
! ___ On creosote, cd to ~ftp/pub/python/X.Y creating it if
necessary.
! ___ Move the previous release files to a directory called "prev"
creating the directory if necessary (make sure the directory
has g+ws bits on). If this is the first alpha release of a
new Python version, skip this step.
! ___ Move the .tgz file and the .exe file to this directory. Make
sure they are world readable. They should also be group
writable, and group-owned by webmaster.
! ___ Update the X.Y/bugs.ht file if necessary. It is best to get
BDFL input for this step.
! ___ Now preview the new-index.ht file once more. IMPORTANT: follow
every link on the page to make sure it goes where you expect it
to go, and that what you expect to be there is there.
! ___ If everything looks good, move new-index.ht to index.ht and do a
"make install" in this directory. Go up to the parent directory
(i.e. the root of the web page hierarchy) and do a "make
install" there too. You're release is now live!
! ___ Now it's time to write the announcement for the mailing lists.
This is the fuzzy bit because not much can be automated. You
can use one of Guido's earlier announcements as a template, but
***************
*** 381,390 ****
python-dev@python.org
! - Go back to the file releases page on SF and complete Step 4,
sending out the email notification.
Now it's time to do some cleanup. These steps are very important!
! - Go back to SF, Admin->Edit/Release Files. Click on "Edit
Releases" for the package you just added to. For each old
release, click on "Edit This Release" and under Step 1, change
--- 418,427 ----
python-dev@python.org
! ___ Go back to the file releases page on SF and complete Step 4,
sending out the email notification.
Now it's time to do some cleanup. These steps are very important!
! ___ Go back to SF, Admin->Edit/Release Files. Click on "Edit
Releases" for the package you just added to. For each old
release, click on "Edit This Release" and under Step 1, change
***************
*** 392,413 ****
button.
! - Merge the branch back into the trunk! Now that we've released
this branch, we don't need it any more. We've already tagged it
so we can always reproduce it. Note that merging branches is a
bit of a black art, but here's what's worked for us.
! * Check out a completely clean, virgin working directory of the
trunk, by doing this in the directory that is the parent of
your branch working directory python-XYaZ:
% cvs -d <cvsroot> co -d python-clean python/dist/src
! * Run a diff against your branch by doing this in the common
parent directory containing both python-clean and python-XYaZ:
% diff -r python-clean python-22a2 | grep ^diff | grep -v CVS
! * Take the output of this and stick it in a file,
e.g. /tmp/diffcmd.sh
! * Edit diffcmd.sh to get rid of files that you know don't have
important changes. You're looking for files that have updates
in the branch that haven't made it to the trunk. If you've
--- 429,450 ----
button.
! ___ Merge the branch back into the trunk! Now that we've released
this branch, we don't need it any more. We've already tagged it
so we can always reproduce it. Note that merging branches is a
bit of a black art, but here's what's worked for us.
! ___ Check out a completely clean, virgin working directory of the
trunk, by doing this in the directory that is the parent of
your branch working directory python-XYaZ:
% cvs -d <cvsroot> co -d python-clean python/dist/src
! ___ Run a diff against your branch by doing this in the common
parent directory containing both python-clean and python-XYaZ:
% diff -r python-clean python-22a2 | grep ^diff | grep -v CVS
! ___ Take the output of this and stick it in a file,
e.g. /tmp/diffcmd.sh
! ___ Edit diffcmd.sh to get rid of files that you know don't have
important changes. You're looking for files that have updates
in the branch that haven't made it to the trunk. If you've
***************
*** 415,423 ****
branch, there shouldn't be many of these files.
! * Edit /tmp/diffcmd.sh, changing all the -r's into -u's. Run
the /tmp/diffcmd.sh command like so:
% sh /tmp/diffcmd.sh > /tmp/pydiff.txt
! * Attempt to patch your python-clean working directory. Do this
first, noting that --dry-run does not actually apply any
patches, it just makes sure that the patch command runs
--- 452,460 ----
branch, there shouldn't be many of these files.
! ___ Edit /tmp/diffcmd.sh, changing all the -r's into -u's. Run
the /tmp/diffcmd.sh command like so:
% sh /tmp/diffcmd.sh > /tmp/pydiff.txt
! ___ Attempt to patch your python-clean working directory. Do this
first, noting that --dry-run does not actually apply any
patches, it just makes sure that the patch command runs
***************
*** 425,438 ****
% patch -p1 --dry-run < /tmp/pydiff.txt
! * If this goes well, run it again, taking out the --dry-run
option. If this fails, or if it prompts you for a file to
patch, try using -p0 instead of -p1. Otherwise, your diff
command was messed up, so try again.
! * cd to python-clean and do a "cvs commit". Use as your log
message something like "Merging the rXYaZ-branch tag back into
the trunk".
! * Edit the file Include/patchlevel.h so that the PY_VERSION
string says something like "X.YaZ+". Note the trailing `+'
indicating that the trunk is going to be moving forward with
--- 462,475 ----
% patch -p1 --dry-run < /tmp/pydiff.txt
! ___ If this goes well, run it again, taking out the --dry-run
option. If this fails, or if it prompts you for a file to
patch, try using -p0 instead of -p1. Otherwise, your diff
command was messed up, so try again.
! ___ cd to python-clean and do a "cvs commit". Use as your log
message something like "Merging the rXYaZ-branch tag back into
the trunk".
! ___ Edit the file Include/patchlevel.h so that the PY_VERSION
string says something like "X.YaZ+". Note the trailing `+'
indicating that the trunk is going to be moving forward with
***************
*** 444,448 ****
correct values. Commit this change.
! * Now test your clean, merged trunk by doing
% make distclean
% ./configure
--- 481,491 ----
correct values. Commit this change.
! ___ For the extra paranoid, do a completely clean test of the
! release. This includes downloading the tarball from either
! SourceForge or www.python.org.
!
! ___ Make sure the md5 checksums match. Then unpack the tarball,
! and do a clean make test.
!
% make distclean
% ./configure
***************
*** 469,472 ****
--- 512,522 ----
You've just made a Python release!
+
+ Actually, there is one more step. You should turn over ownership
+ of the branch to Jack Jansen. All this means is that now he will
+ be responsible for making commits to the branch. He's going to
+ use this to build the MacOS versions. He may send you information
+ about the Mac release that should be merged into the informational
+ pages on SourceForge or www.python.org.