Commit 403e6845 authored by PJ Eby's avatar PJ Eby

* Fixed ``AttributeError`` when trying to download a ``setup_requires``

  dependency when a distribution lacks a ``dependency_links`` setting.

* Made ``zip-safe`` and ``not-zip-safe`` flag files contain a single byte,
  so as to play better with packaging tools that complain about zero-length
  files.

* Made ``setup.py develop`` respect the ``--no-deps`` option, which it
  previously was ignoring.

(bug fixes backported from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4050659
parent d9cf1dca
......@@ -2563,6 +2563,17 @@ XXX
Release Notes/Change History
----------------------------
0.6c1
* Fixed ``AttributeError`` when trying to download a ``setup_requires``
dependency when a distribution lacks a ``dependency_links`` setting.
* Made ``zip-safe`` and ``not-zip-safe`` flag files contain a single byte, so
as to play better with packaging tools that complain about zero-length
files.
* Made ``setup.py develop`` respect the ``--no-deps`` option, which it
previously was ignoring.
0.6b4
* Fix ``register`` not obeying name/version set by ``egg_info`` command, if
``egg_info`` wasn't explicitly run first on the same command line.
......
......@@ -360,7 +360,7 @@ def write_safety_flag(egg_dir, safe):
if safe is None or bool(safe)<>flag:
os.unlink(fn)
elif safe is not None and bool(safe)==flag:
open(fn,'w').close()
f=open(fn,'wb'); f.write('\n'); f.close()
safety_flags = {
True: 'zip-safe',
......
......@@ -78,7 +78,7 @@ class develop(easy_install):
# postprocess the installed distro, fixing up .pth, installing scripts,
# and handling requirements
self.process_distribution(None, self.dist)
self.process_distribution(None, self.dist, not self.no_deps)
def uninstall_link(self):
if os.path.exists(self.egg_link):
......
......@@ -212,8 +212,8 @@ class Distribution(_Distribution):
self.dist_files = []
self.patch_missing_pkg_info(attrs)
# Make sure we have any eggs needed to interpret 'attrs'
if attrs and 'dependency_links' in attrs:
self.dependency_links = attrs.pop('dependency_links')
if attrs is not None:
self.dependency_links = attrs.pop('dependency_links', [])
assert_string_list(self,'dependency_links',self.dependency_links)
if attrs and 'setup_requires' in attrs:
self.fetch_build_eggs(attrs.pop('setup_requires'))
......
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