diff options
| -rwxr-xr-x | setuptools.txt | 11 | ||||
| -rw-r--r-- | setuptools/command/bdist_egg.py | 2 | ||||
| -rwxr-xr-x | setuptools/command/develop.py | 2 | ||||
| -rw-r--r-- | setuptools/dist.py | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/setuptools.txt b/setuptools.txt index a2cce583..1474e335 100755 --- a/setuptools.txt +++ b/setuptools.txt @@ -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. diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index 0ae3984e..981a1f9b 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -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', diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index f38506bb..49b5b3ac 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -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): diff --git a/setuptools/dist.py b/setuptools/dist.py index 724d5c5d..73269574 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -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')) |