diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-28 11:16:50 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-28 11:16:50 -0400 |
| commit | bf1ea34fb467367688fa6ec5d77e98282020d82d (patch) | |
| tree | 351b8cd583de45667adce41a6cc95d386a5c4b87 | |
| parent | c12b3db412210faa982134dce22b5e6ddad31bba (diff) | |
| download | external_python_setuptools-bf1ea34fb467367688fa6ec5d77e98282020d82d.tar.gz external_python_setuptools-bf1ea34fb467367688fa6ec5d77e98282020d82d.tar.bz2 external_python_setuptools-bf1ea34fb467367688fa6ec5d77e98282020d82d.zip | |
Allow setuptools 0.7 to satisfy use_setuptools.0.6.44
--HG--
branch : distribute
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | distribute_setup.py | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 7d22ae1b..e18a534b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,13 @@ CHANGES ======= ------ +0.6.44 +------ + +* ``distribute_setup.py`` has been updated to allow Setuptools 0.7 to + satisfy use_setuptools. + +------ 0.6.43 ------ diff --git a/distribute_setup.py b/distribute_setup.py index a2a06664..411c9c8c 100644 --- a/distribute_setup.py +++ b/distribute_setup.py @@ -144,6 +144,15 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, try: try: import pkg_resources + + # Setuptools 0.7b and later is a suitable (and preferable) + # substitute for any Distribute version. + try: + pkg_resources.require("setuptools>=0.7b") + return + except pkg_resources.DistributionNotFound: + pass + if not hasattr(pkg_resources, '_distribute'): if not no_fake: _fake_setuptools() |