diff options
| -rwxr-xr-x | EasyInstall.txt | 2 | ||||
| -rwxr-xr-x | ez_setup.py | 2 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rwxr-xr-x | setuptools.txt | 6 | ||||
| -rw-r--r-- | setuptools/__init__.py | 2 | ||||
| -rwxr-xr-x | setuptools/command/develop.py | 4 |
6 files changed, 11 insertions, 7 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 448d18b0..b72f5cd8 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -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 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, automatically building and installing it:: diff --git a/ez_setup.py b/ez_setup.py index f6d79095..083acb76 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. """ -DEFAULT_VERSION = "0.5a10" +DEFAULT_VERSION = "0.5a11" DEFAULT_URL = "http://www.python.org/packages/source/s/setuptools/" import sys, os @@ -15,7 +15,7 @@ def get_description(): f.close() return ''.join(lines) -VERSION = "0.5a10" +VERSION = "0.5a11" from setuptools import setup, find_packages diff --git a/setuptools.txt b/setuptools.txt index 78b0d34e..fc653fc2 100755 --- a/setuptools.txt +++ b/setuptools.txt @@ -1332,10 +1332,14 @@ XXX 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 * 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 - ``easy-install.pth`` file. + ``easy-install.pth`` file). * Fix a problem with "basket" support in ``pkg_resources``, where egg-finding never actually went inside ``.egg`` files. diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 1cd86f72..df107d81 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.5a10' +__version__ = '0.5a11' __all__ = [ 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'find_packages' diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index 9ade5aaf..a757b2e5 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -24,6 +24,8 @@ class develop(easy_install): command_consumes_arguments = False # override base + negative_opt = {} + def run(self): if self.uninstall: self.multi_version = True @@ -37,8 +39,6 @@ class develop(easy_install): - - def finalize_options(self): ei = self.get_finalized_command("egg_info") self.args = [ei.egg_name] |