Commit 878bea05 authored by PJ Eby's avatar PJ Eby

Fix breakage of the "develop" command that was caused by the addition of

``--always-unzip`` to the ``easy_install`` command.  Bump version for bug
fix release.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041120
parent 171e2214
...@@ -67,7 +67,7 @@ version, and automatically downloading, building, and installing it:: ...@@ -67,7 +67,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.5a10" easy_install -f http://peak.telecommunity.com/dist "setuptools>=0.5a11"
**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::
......
...@@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``. ...@@ -14,7 +14,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.5a10" DEFAULT_VERSION = "0.5a11"
DEFAULT_URL = "http://www.python.org/packages/source/s/setuptools/" DEFAULT_URL = "http://www.python.org/packages/source/s/setuptools/"
import sys, os import sys, os
......
...@@ -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.5a10" VERSION = "0.5a11"
from setuptools import setup, find_packages from setuptools import setup, find_packages
......
...@@ -1332,10 +1332,14 @@ XXX ...@@ -1332,10 +1332,14 @@ XXX
Release Notes/Change History Release Notes/Change History
---------------------------- ----------------------------
0.5a11
* Fix breakage of the "develop" command that was caused by the addition of
``--always-unzip`` to the ``easy_install`` command.
0.5a10 0.5a10
* Fix a problem with ``pkg_resources`` being confused by non-existent eggs on * Fix a problem with ``pkg_resources`` being confused by non-existent eggs on
``sys.path`` (e.g. if a user deletes an egg without removing it from the ``sys.path`` (e.g. if a user deletes an egg without removing it from the
``easy-install.pth`` file. ``easy-install.pth`` file).
* Fix a problem with "basket" support in ``pkg_resources``, where egg-finding * Fix a problem with "basket" support in ``pkg_resources``, where egg-finding
never actually went inside ``.egg`` files. never actually went inside ``.egg`` files.
......
...@@ -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.5a10' __version__ = '0.5a11'
__all__ = [ __all__ = [
'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
'find_packages' 'find_packages'
......
...@@ -24,6 +24,8 @@ class develop(easy_install): ...@@ -24,6 +24,8 @@ class develop(easy_install):
command_consumes_arguments = False # override base command_consumes_arguments = False # override base
negative_opt = {}
def run(self): def run(self):
if self.uninstall: if self.uninstall:
self.multi_version = True self.multi_version = True
...@@ -37,8 +39,6 @@ class develop(easy_install): ...@@ -37,8 +39,6 @@ class develop(easy_install):
def finalize_options(self): def finalize_options(self):
ei = self.get_finalized_command("egg_info") ei = self.get_finalized_command("egg_info")
self.args = [ei.egg_name] self.args = [ei.egg_name]
......
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