Creating a branch for the "stable" 0.6 development line of setuptools,

so that it can continue forward to 0.6b1 and onward, while using the
trunk for 0.7 development and Python 2.5 snapshots thereof.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4045397

6 files changed, 79 insertions, 3 deletions

diff --git a/ez_setup.py b/ez_setup.py
index 3b0a79c5..6b55d7f1 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``.
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6a12"
+DEFAULT_VERSION = "0.6b1"
 DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
diff --git a/release.sh b/release.sh
new file mode 100755
index 00000000..4f76b29b
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script is for PJE's working environment only, to upload
+# releases to PyPI, telecommunity, eby-sarna SVN, update local
+# project checkouts, etc.
+#
+# If your initials aren't PJE, don't run it.  :)
+#
+
+export VERSION="0.6b1"
+
+wpython setup.py -q source && \
+cpython setup.py -q binary && \
+python ez_setup.py --md5update dist/setuptools-$VERSION*-py2.?.egg && \
+  scp ez_setup.py virtual-python.py t3:web/PEAK/dist/ && \
+  cp ez_setup.py ~/projects/ez_setup/__init__.py && \
+  svn ci -m "Update ez_setup for setuptools $VERSION" \
+      ~/projects/ez_setup/__init__.py && \
+  svn up ~/projects/*/ez_setup
+
+# XXX update wiki pages from EasyInstall.txt, setuptools.txt, & 
+#     pkg_resources.txt
diff --git a/setup.py b/setup.py
index c9183cde..3bbe1c0c 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ from distutils.util import convert_path
 d = {}; execfile(convert_path('setuptools/command/__init__.py'), d)
 SETUP_COMMANDS = d['__all__']
 
-VERSION = "0.6a12"
+VERSION = "0.6b1"
 from setuptools import setup, find_packages
 import sys
 scripts = []
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 742ac076..fa152150 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@ from distutils.core import Command as _Command
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6a12'
+__version__ = '0.6b1'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
diff --git a/version b/version
new file mode 100755
index 00000000..a94bd978
--- /dev/null
+++ b/version
@@ -0,0 +1,48 @@
+#!/usr/local/bin/invoke /usr/local/bin/c6peak version-config
+
+# This is a PEAK 'version' tool configuration file, that's
+# also executable.  PJE uses it to bump version numbers in
+# the various parts of the project without having to edit them
+# by hand.  The current version is stored in the version.dat
+# file.  
+
+# These are not the droids you're looking for.  You can go on
+# about your business...
+
+<Scheme default>
+    DefaultFormat full
+    part major
+    part minor
+    part status choice alpha beta "release candidate" final
+    part build
+    part date   timestamp
+
+    <Formats>
+    trailer   remap status "a%(build)s" "b%(build)s" "c%(build)s" "%(dot-maint)s"
+    dot-maint optional build ".%(build)s"
+    full      "%(major)s.%(minor)s %(status)s %(build)s"
+    short     "%(major)s.%(minor)s%(trailer)s"
+    </Formats>
+</Scheme>
+
+<Module>
+    Name setuptools
+
+    <Edit>
+    File setup.py
+    File ez_setup.py
+    Match 'VERSION = "%(short)s"'
+    </Edit>
+
+    <Edit>
+    File release.sh
+    Match 'VERSION="%(short)s"'
+    </Edit>
+
+    <Edit>
+    File setuptools/__init__.py
+    Match "__version__ = '%(short)s'"
+    </Edit>
+
+</Module>
+
diff --git a/version.dat b/version.dat
new file mode 100755
index 00000000..19a1f683
--- /dev/null
+++ b/version.dat
@@ -0,0 +1,6 @@
+[setuptools]

+status = 'beta'

+major = 0

+build = 1

+minor = 6

+