Author: mattip <[email protected]> Branch: Changeset: r77603:53233b5d8eba Date: 2015-05-26 23:37 +0300 http://bitbucket.org/pypy/pypy/changeset/53233b5d8eba/
Log: release management tweaks diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py --- a/pypy/doc/conf.py +++ b/pypy/doc/conf.py @@ -65,9 +65,9 @@ # built documents. # # The short X.Y version. -version = '2.5' +version = '2.6' # The full version, including alpha/beta/rc tags. -release = '2.5.1' +release = '2.6.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst --- a/pypy/doc/how-to-release.rst +++ b/pypy/doc/how-to-release.rst @@ -15,12 +15,12 @@ Release Steps ------------- -* at code freeze make a release branch using release-x.x.x in mercurial - IMPORTANT: bump the +* At code freeze make a release branch using release-x.x.x in mercurial + Bump the pypy version number in module/sys/version.py and in - module/cpyext/include/patchlevel.h, notice that the branch - will capture the revision number of this change for the release; - some of the next updates may be done before or after branching; make + module/cpyext/include/patchlevel.h. The branch + will capture the revision number of this change for the release. + Some of the next updates may be done before or after branching; make sure things are ported back to the trunk and to the branch as necessary; also update the version number in pypy/doc/conf.py. * update pypy/doc/contributor.rst (and possibly LICENSE) @@ -30,22 +30,27 @@ and add the new file to pypy/doc/index-of-whatsnew.rst * go to pypy/tool/release and run: force-builds.py <release branch> -* wait for builds to complete, make sure there are no failures -* upload binaries to https://bitbucket.org/pypy/pypy/downloads - Following binaries should be built, however, we need more buildbots: + The following binaries should be built, however, we need more buildbots: JIT: windows, linux, os/x, armhf, armel no JIT: windows, linux, os/x sandbox: linux, os/x -* repackage and upload source "-src.tar.bz2" to bitbucket and to cobra, as some - packagers prefer a clearly labeled source package (download e.g. - https://bitbucket.org/pypy/pypy/get/release-2.5.x.tar.bz2, unpack, - rename the top-level directory to "pypy-2.5.0-src", repack, and upload) +* wait for builds to complete, make sure there are no failures +* download the builds, repackage binaries. Tag the release version + and download and repackage source from bitbucket. You may find it + convenient to use the repackage.sh script in pypy/tools to do this. + Otherwise, repackage and upload source "-src.tar.bz2" to bitbucket + and to cobra, as some packagers prefer a clearly labeled source package + (download e.g. https://bitbucket.org/pypy/pypy/get/release-2.5.x.tar.bz2, + unpack, rename the top-level directory to "pypy-2.5.0-src", repack, and upload) + +* Upload binaries to https://bitbucket.org/pypy/pypy/downloads * write release announcement pypy/doc/release-x.y(.z).txt the release announcement should contain a direct link to the download page and add new files to pypy/doc/index-of-release-notes.rst + * update pypy.org (under extradoc/pypy.org), rebuild and commit * post announcement on morepypy.blogspot.com diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh new file mode 100755 --- /dev/null +++ b/pypy/tool/release/repackage.sh @@ -0,0 +1,41 @@ +# Edit these appropriately before running this script +maj=2 +min=6 +rev=0 +# This script will download latest builds from the buildmaster, rename the top +# level directory, and repackage ready to be uploaded to bitbucket. It will also +# download source, assuming a tag for the release already exists, and repackage them. + +for plat in linux linux64 linux-armhf-raspbian linux-armhf-raring linux-armel osx64 + do + wget http://buildbot.pypy.org/nightly/release-$maj.$min.x/pypy-c-jit-latest-$plat.tar.bz2 + tar -xf pypy-c-jit-latest-$plat.tar.bz2 + rm pypy-c-jit-latest-$plat.tar.bz2 + mv pypy-c-jit-*-$plat pypy-$maj.$min.$rev-$plat + tar --owner=root --group=root --numeric-owner -cvjf pypy-$maj.$min.$rev-$plat.tar.bz2 pypy-$maj.$min.$rev-$plat + rm -rf pypy-$maj.$min.$rev-$plat + done + +plat=win32 +wget http://buildbot.pypy.org/nightly/release-$maj.$min.x/pypy-c-jit-latest-$plat.zip +unzip pypy-c-jit-latest-$plat.zip +mv pypy-c-jit-*-$plat pypy-$maj.$min.$rev-$plat +zip -r pypy-$maj.$min.$rev-$plat.zip pypy-$maj.$min.$rev-$plat +rm -rf pypy-$maj.$min.$rev-$plat + +# Do this after creating a tag, note the untarred directory is pypy-pypy-<hash> +# so make sure there is not another one +wget https://bitbucket.org/pypy/pypy/get/release-$maj.$min.$rev.tar.bz2 +tar -xf release-$maj.$min.$rev.tar.bz2 +mv pypy-pypy-* pypy-$maj.$min.$rev-src +tar --owner=root --group=root --numeric-owner -cvjf pypy-$maj.$min.$rev-src.tar.bz2 pypy-$maj.$min.$rev-src +zip -r pypy-$maj.$min.$rev-src.zip pypy-$maj.$min.$rev-src +rm -rf pypy-$maj.$min.$rev-src + +# Print out the md5, sha1 +md5sum *.bz2 *.zip +sha1sum *.bz2 *.zip + +# Now upload all the bz2 and zip + + _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
