Commit ba116dd3 authored by PJ Eby's avatar PJ Eby

Bump release version to 0.6a1. Fix a minor cosmetic issue on certain

ez_setup installs.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041224
parent 369ee001
...@@ -77,7 +77,7 @@ version, and automatically downloading, building, and installing it:: ...@@ -77,7 +77,7 @@ version, and automatically downloading, building, and installing it::
**Example 2**. Install or upgrade a package by name and version by finding **Example 2**. Install or upgrade a package by name and version by finding
links on a given "download page":: links on a given "download page"::
easy_install -f http://peak.telecommunity.com/dist "setuptools>=0.6a0" easy_install -f http://peak.telecommunity.com/dist "setuptools>=0.6a1"
**Example 3**. Download a source distribution from a specified URL, **Example 3**. Download a source distribution from a specified URL,
automatically building and installing it:: automatically building and installing it::
......
...@@ -13,7 +13,7 @@ the appropriate options to ``use_setuptools()``. ...@@ -13,7 +13,7 @@ the appropriate options to ``use_setuptools()``.
This file can also be run as a script to install or upgrade setuptools. This file can also be run as a script to install or upgrade setuptools.
""" """
DEFAULT_VERSION = "0.6a0" DEFAULT_VERSION = "0.6a1"
DEFAULT_URL = "http://www.python.org/packages/source/s/setuptools/" DEFAULT_URL = "http://www.python.org/packages/source/s/setuptools/"
md5_data = { md5_data = {
...@@ -150,7 +150,7 @@ def main(argv, version=DEFAULT_VERSION): ...@@ -150,7 +150,7 @@ def main(argv, version=DEFAULT_VERSION):
from setuptools.command.easy_install import main from setuptools.command.easy_install import main
except ImportError: except ImportError:
from easy_install import main from easy_install import main
main(list(argv)+[download_setuptools()]) main(list(argv)+[download_setuptools(delay=0)])
sys.exit(0) # try to force an exit sys.exit(0) # try to force an exit
else: else:
if argv: if argv:
......
...@@ -15,7 +15,7 @@ def get_description(): ...@@ -15,7 +15,7 @@ def get_description():
f.close() f.close()
return ''.join(lines) return ''.join(lines)
VERSION = "0.6a0" VERSION = "0.6a1"
from setuptools import setup, find_packages from setuptools import setup, find_packages
import sys import sys
......
...@@ -7,7 +7,7 @@ from distutils.core import Command as _Command ...@@ -7,7 +7,7 @@ from distutils.core import Command as _Command
from distutils.util import convert_path from distutils.util import convert_path
import os.path import os.path
__version__ = '0.6a0' __version__ = '0.6a1'
__all__ = [ __all__ = [
'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
'find_packages' 'find_packages'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment