[Checkins] SVN: zc.buildout/branches/tlotze-download-api/ merged trunk

Thomas Lotze tl at gocept.com
Tue Jun 23 03:45:18 EDT 2009 

Log message for revision 101245:
  merged trunk

Changed:
  U   zc.buildout/branches/tlotze-download-api/CHANGES.txt
  U   zc.buildout/branches/tlotze-download-api/bootstrap/bootstrap.py
  U   zc.buildout/branches/tlotze-download-api/setup.py
  U   zc.buildout/branches/tlotze-download-api/src/zc/buildout/bootstrap.txt
  U   zc.buildout/branches/tlotze-download-api/src/zc/buildout/easy_install.py
  U   zc.buildout/branches/tlotze-download-api/src/zc/buildout/easy_install.txt
  U   zc.buildout/branches/tlotze-download-api/zc.recipe.egg_/src/zc/recipe/egg/README.txt
  U   zc.buildout/branches/tlotze-download-api/zc.recipe.egg_/src/zc/recipe/egg/tests.py

-=-
Modified: zc.buildout/branches/tlotze-download-api/CHANGES.txt
===================================================================
--- zc.buildout/branches/tlotze-download-api/CHANGES.txt	2009-06-23 07:39:21 UTC (rev 101244)
+++ zc.buildout/branches/tlotze-download-api/CHANGES.txt	2009-06-23 07:45:18 UTC (rev 101245)
@@ -1,7 +1,7 @@
 Change History
 **************
 
-1.3.0 (unreleased)
+1.3.1 (unreleased)
 ==================
 
 - Added a download API that handles the download cache, offline mode etc and
@@ -10,7 +10,7 @@
 - Used the download API to allow caching of base configurations (specified by
   the buildout section's 'extends' option).
 
-1.2.2 (2009-06-19)
+1.3.0 (2009-06-22)
 ==================
 
 - Better Windows compatibility in test infrastructure.
@@ -27,6 +27,10 @@
 
 - Added an unload entry point for extensions.
 
+- Fixed bug: when the relative paths option was used, relative paths
+  could be inserted into sys.path if a relative path was used to run
+  the generated script.
+
 1.2.1 (2009-03-18)
 ==================
 

Modified: zc.buildout/branches/tlotze-download-api/bootstrap/bootstrap.py
===================================================================
--- zc.buildout/branches/tlotze-download-api/bootstrap/bootstrap.py	2009-06-23 07:39:21 UTC (rev 101244)
+++ zc.buildout/branches/tlotze-download-api/bootstrap/bootstrap.py	2009-06-23 07:45:18 UTC (rev 101245)
@@ -50,7 +50,7 @@
 ws  = pkg_resources.working_set
 
 if len(sys.argv) > 2 and sys.argv[1] == '--version':
-    VERSION = ' == %s' % sys.argv[2]
+    VERSION = '==%s' % sys.argv[2]
     args = sys.argv[3:] + ['bootstrap']
 else:
     VERSION = ''

Modified: zc.buildout/branches/tlotze-download-api/setup.py
===================================================================
--- zc.buildout/branches/tlotze-download-api/setup.py	2009-06-23 07:39:21 UTC (rev 101244)
+++ zc.buildout/branches/tlotze-download-api/setup.py	2009-06-23 07:45:18 UTC (rev 101245)
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-version = "1.3.0dev"
+version = "1.3.1dev"
 
 import os
 from setuptools import setup, find_packages

Modified: zc.buildout/branches/tlotze-download-api/src/zc/buildout/bootstrap.txt
===================================================================
--- zc.buildout/branches/tlotze-download-api/src/zc/buildout/bootstrap.txt	2009-06-23 07:39:21 UTC (rev 101244)
+++ zc.buildout/branches/tlotze-download-api/src/zc/buildout/bootstrap.txt	2009-06-23 07:45:18 UTC (rev 101245)
@@ -75,6 +75,8 @@
 Let's make sure the generated `buildout` script uses it::
 
     >>> buildout_script = join(sample_buildout, 'bin', 'buildout')
+    >>> if sys.platform.startswith('win'):
+    ...     buildout_script += '-script.py'
     >>> print open(buildout_script).read() # doctest: +ELLIPSIS
     #...
     <BLANKLINE>

Modified: zc.buildout/branches/tlotze-download-api/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/tlotze-download-api/src/zc/buildout/easy_install.py	2009-06-23 07:39:21 UTC (rev 101244)
+++ zc.buildout/branches/tlotze-download-api/src/zc/buildout/easy_install.py	2009-06-23 07:45:18 UTC (rev 101245)
@@ -1023,7 +1023,7 @@
 import os
 
 join = os.path.join
-base = os.path.dirname(__file__)
+base = os.path.dirname(os.path.abspath(__file__))
 """
 
 def _script(module_name, attrs, path, dest, executable, arguments,

Modified: zc.buildout/branches/tlotze-download-api/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/tlotze-download-api/src/zc/buildout/easy_install.txt	2009-06-23 07:39:21 UTC (rev 101244)
+++ zc.buildout/branches/tlotze-download-api/src/zc/buildout/easy_install.txt	2009-06-23 07:45:18 UTC (rev 101245)
@@ -817,7 +817,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(__file__))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys
@@ -849,7 +849,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(__file__))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys

Modified: zc.buildout/branches/tlotze-download-api/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/branches/tlotze-download-api/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2009-06-23 07:39:21 UTC (rev 101244)
+++ zc.buildout/branches/tlotze-download-api/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2009-06-23 07:45:18 UTC (rev 101245)
@@ -425,7 +425,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(__file__))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys
@@ -472,7 +472,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(__file__))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys

Modified: zc.buildout/branches/tlotze-download-api/zc.recipe.egg_/src/zc/recipe/egg/tests.py
===================================================================
--- zc.buildout/branches/tlotze-download-api/zc.recipe.egg_/src/zc/recipe/egg/tests.py	2009-06-23 07:39:21 UTC (rev 101244)
+++ zc.buildout/branches/tlotze-download-api/zc.recipe.egg_/src/zc/recipe/egg/tests.py	2009-06-23 07:45:18 UTC (rev 101245)
@@ -50,7 +50,9 @@
                zc.buildout.tests.normalize_bang,
                (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
                 'zc.buildout.egg'),
-               (re.compile('[-d]  setuptools-[^-]+-'), 'setuptools-X-')
+               (re.compile('[-d]  setuptools-[^-]+-'), 'setuptools-X-'),
+               (re.compile(r'eggs\\\\demo'), 'eggs/demo'),
+               (re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'),
                ])
             ),
         doctest.DocFileSuite(

More information about the Checkins mailing list