[Checkins] SVN: zc.buildout/trunk/ Bugs Fixed
Jim Fulton
jim at zope.com
Mon Oct 2 14:01:17 EDT 2006
Log message for revision 70497:
Bugs Fixed
----------
Non-zip-safe eggs were not unzipped when they were installed.
Changed:
U zc.buildout/trunk/CHANGES.txt
U zc.buildout/trunk/setup.py
U zc.buildout/trunk/src/zc/buildout/easy_install.py
U zc.buildout/trunk/src/zc/buildout/easy_install.txt
U zc.buildout/trunk/src/zc/buildout/tests.py
U zc.buildout/trunk/src/zc/buildout/testselectingpython.py
U zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
U zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py
-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt 2006-10-02 17:43:11 UTC (rev 70496)
+++ zc.buildout/trunk/CHANGES.txt 2006-10-02 18:01:16 UTC (rev 70497)
@@ -22,6 +22,14 @@
Change History
**************
+1.0.0b9 (2006-10-02)
+====================
+
+Bugs Fixed
+----------
+
+Non-zip-safe eggs were not unzipped when they were installed.
+
1.0.0b8 (2006-10-01)
====================
Modified: zc.buildout/trunk/setup.py
===================================================================
--- zc.buildout/trunk/setup.py 2006-10-02 17:43:11 UTC (rev 70496)
+++ zc.buildout/trunk/setup.py 2006-10-02 18:01:16 UTC (rev 70497)
@@ -7,7 +7,7 @@
name = "zc.buildout"
setup(
name = name,
- version = "1.0.0b8",
+ version = "1.0.0b9",
author = "Jim Fulton",
author_email = "jim at zope.com",
description = "System for managing development buildouts",
Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py 2006-10-02 17:43:11 UTC (rev 70496)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py 2006-10-02 18:01:16 UTC (rev 70497)
@@ -229,16 +229,17 @@
"Couln't download a distribution for %s."
% requirement)
- should_unzip = False
if always_unzip:
+ should_unzip = True
+ else:
metadata = pkg_resources.EggMetadata(
zipimport.zipimporter(dist.location)
)
- should_unzip = not (
+ should_unzip = (
metadata.has_metadata('not-zip-safe')
- or
- not metadata.has_metadata('zip-safe')
+ or not metadata.has_metadata('zip-safe')
)
+
if should_unzip:
setuptools.archive_util.unpack_archive(
dist.location,
Modified: zc.buildout/trunk/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.txt 2006-10-02 17:43:11 UTC (rev 70496)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.txt 2006-10-02 18:01:16 UTC (rev 70497)
@@ -134,7 +134,7 @@
- demo-0.3-py2.4.egg
- demoneeded-1.0-py2.4.egg
- demoneeded-1.1-py2.4.egg
- - other-1.0-py2.4.egg
+ d other-1.0-py2.4.egg
We can request that eggs be unzipped even if they are zip safe. This
can be useful when debugging.
Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py 2006-10-02 17:43:11 UTC (rev 70496)
+++ zc.buildout/trunk/src/zc/buildout/tests.py 2006-10-02 18:01:16 UTC (rev 70497)
@@ -403,7 +403,7 @@
write(
tmp, 'setup.py',
"from setuptools import setup\n"
- "setup(name='other', zip_safe=True, version='1.0', "
+ "setup(name='other', zip_safe=False, version='1.0', "
"py_modules=['eggrecipedemobeeded'])\n"
)
zc.buildout.testing.bdist_egg(tmp, executable, dest)
Modified: zc.buildout/trunk/src/zc/buildout/testselectingpython.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/testselectingpython.py 2006-10-02 17:43:11 UTC (rev 70496)
+++ zc.buildout/trunk/src/zc/buildout/testselectingpython.py 2006-10-02 18:01:16 UTC (rev 70497)
@@ -30,7 +30,7 @@
>>> ls(dest)
d demo-0.3-py2.3.egg
d demoneeded-1.1-py2.3.egg
- - setuptools-0.6-py2.3.egg
+ d setuptools-0.6-py2.3.egg
"""
Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2006-10-02 17:43:11 UTC (rev 70496)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2006-10-02 18:01:16 UTC (rev 70497)
@@ -61,8 +61,8 @@
>>> ls(sample_buildout, 'eggs')
- demo-0.2-py2.3.egg
- demoneeded-1.1-py2.3.egg
- - setuptools-0.6-py2.3.egg
- - setuptools-0.6-py2.4.egg
+ d setuptools-0.6-py2.3.egg
+ d setuptools-0.6-py2.4.egg
- zc.buildout-1.0-py2.4.egg
And the generated scripts invoke Python 2.3:
Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py 2006-10-02 17:43:11 UTC (rev 70496)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py 2006-10-02 18:01:16 UTC (rev 70497)
@@ -104,7 +104,7 @@
zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_script,
(re.compile('Got setuptools \S+'), 'Got setuptools V'),
- (re.compile('setuptools-\S+-py'), 'setuptools-V-py'),
+ (re.compile('([d-] )?setuptools-\S+-py'), 'setuptools-V-py'),
(re.compile('-py2[.][0-24-9][.]'), 'py2.4.'),
(re.compile('zc.buildout-\S+[.]egg'),
'zc.buildout.egg'),
More information about the Checkins
mailing list