[Python-checkins] r50659 - in sandbox/branches/setuptools-0.6: setuptools.txt setuptools/command/bdist_egg.py setuptools/command/develop.py setuptools/dist.py

[phillip.eby]

Author: phillip.eby
Date: Sat Jul 15 01:37:52 2006
New Revision: 50659

Modified:
   sandbox/branches/setuptools-0.6/setuptools.txt
   sandbox/branches/setuptools-0.6/setuptools/command/bdist_egg.py
   sandbox/branches/setuptools-0.6/setuptools/command/develop.py
   sandbox/branches/setuptools-0.6/setuptools/dist.py
Log:
* 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)


Modified: sandbox/branches/setuptools-0.6/setuptools.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools.txt	(original)
+++ sandbox/branches/setuptools-0.6/setuptools.txt	Sat Jul 15 01:37:52 2006
@@ -2563,6 +2563,17 @@
 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.

Modified: sandbox/branches/setuptools-0.6/setuptools/command/bdist_egg.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/bdist_egg.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/bdist_egg.py	Sat Jul 15 01:37:52 2006
@@ -360,7 +360,7 @@
             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',

Modified: sandbox/branches/setuptools-0.6/setuptools/command/develop.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/develop.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/develop.py	Sat Jul 15 01:37:52 2006
@@ -78,7 +78,7 @@
 
         # 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):

Modified: sandbox/branches/setuptools-0.6/setuptools/dist.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/dist.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/dist.py	Sat Jul 15 01:37:52 2006
@@ -212,8 +212,8 @@
         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'))