Switch setuptools to use 'dev-rNNNN' version tags by default, and configure

so that people can use 'ez_setup.py setuptools==dev' to fetch the latest
in-development version.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041381

5 files changed, 15 insertions, 8 deletions

diff --git a/ez_setup.py b/ez_setup.py
index b9d4f2da..9d19a958 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.6a7"
+DEFAULT_VERSION = "0.6a8"
 DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
diff --git a/setup.cfg b/setup.cfg
index 262c793d..1ae92707 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,3 +3,6 @@ binary = bdist_egg upload --show-response
 develop = develop
 source = register sdist binary
 
+[egg_info]
+tag_build = dev
+tag_svn_revision = 1
diff --git a/setup.py b/setup.py
index 5e6bd436..174a052b 100755
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ def get_description():
     f.close()
     return ''.join(lines)
 
-VERSION = "0.6a7"
+VERSION = "0.6a8"
 from setuptools import setup, find_packages
 import sys
 from setuptools.command import __all__ as SETUP_COMMANDS
diff --git a/setuptools.txt b/setuptools.txt
index 0395ab2c..82bd81da 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -62,6 +62,10 @@ Feature Highlights:
 * Create extensible applications and frameworks that automatically discover
   extensions, using simple "entry points" declared in a project's setup script.
 
+In addition to the PyPI downloads, the development version of ``setuptools``
+is available from the `Python SVN sandbox`_.
+
+.. _Python SVN sandbox: http://svn.python.org/projects/sandbox/trunk/setuptools/#egg=setuptools-dev
 
 .. contents:: **Table of Contents**
 
@@ -98,13 +102,13 @@ You may receive a message telling you about an obsolete version of
 setuptools being present; if so, you must be sure to delete it entirely, along
 with the old ``pkg_resources`` module if it's present on ``sys.path``.
 
-To get the in-development version of setuptools, run::
+To get the in-development version of setuptools, first install a stable version
+using the instructions above.  Then run::
 
-    cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/python login
-    cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/python \
-        co -d setuptools python/nondist/sandbox/setuptools
+    ez_setup.py setuptools==dev
 
-You can then install it using the usual "setup.py install" incantation.
+This will download and install the latest development (i.e. unstable) version
+of setuptools from the Python Subversion sandbox.
 
 (Note that ``setuptools`` *must* be installed as an egg directory; it will not
 operate correctly otherwise.  If you are unable to install to a valid
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 3e88096d..e88f0791 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@ from distutils.core import Command as _Command
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6a7'
+__version__ = '0.6a8'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'