[Checkins] SVN: z3c.recipe.egg_/trunk/z3c/recipe/egg/ * Revert the
part initialization work. This approach doesn't work or
Ross Patterson
me at rpatterson.net
Sat Jun 7 15:36:25 EDT 2008
Log message for revision 87234:
* Revert the part initialization work. This approach doesn't work or
make sense after all.
Changed:
U z3c.recipe.egg_/trunk/z3c/recipe/egg/__init__.py
U z3c.recipe.egg_/trunk/z3c/recipe/egg/editable.txt
U z3c.recipe.egg_/trunk/z3c/recipe/egg/setup.txt
U z3c.recipe.egg_/trunk/z3c/recipe/egg/tests/tests.py
-=-
Modified: z3c.recipe.egg_/trunk/z3c/recipe/egg/__init__.py
===================================================================
--- z3c.recipe.egg_/trunk/z3c/recipe/egg/__init__.py 2008-06-07 19:31:16 UTC (rev 87233)
+++ z3c.recipe.egg_/trunk/z3c/recipe/egg/__init__.py 2008-06-07 19:36:25 UTC (rev 87234)
@@ -1,10 +1,11 @@
import sys, os, pkg_resources, subprocess
import distutils.core
-from zc.buildout import easy_install
+import setuptools.command.easy_install
+import zc.buildout.easy_install
import zc.recipe.egg
-ei_logger = easy_install.logger
+ei_logger = zc.buildout.easy_install.logger
class Setup(object):
@@ -12,20 +13,8 @@
self.buildout = buildout
self.name = name
self.options = options
- self.onInit = (
- options.setdefault('init', 'True').lower()
- in ['true', 'yes', '1'])
- if self.onInit:
- self.setup()
def install(self):
- if not self.onInit:
- self.setup()
- return ()
-
- update = install
-
- def setup(self):
setups = [os.path.join(self.buildout['buildout']['directory'],
setup.strip())
for setup in self.options['setup'].split('\n')
@@ -37,7 +26,11 @@
if self.options.get('develop') == 'true':
develop(self, setups)
+
+ return ()
+ update = install
+
class Editable(zc.recipe.egg.Eggs):
def __init__(self, buildout, name, options):
@@ -65,23 +58,10 @@
options['versions'] = self.get_online_versions()
else:
options['versions'] = self.get_offline_versions()
-
- self.onInit = (
- options.setdefault('init', 'True').lower()
- in ['true', 'yes', '1'])
- if self.onInit:
- self.setup()
-
- def install(self):
- if not self.onInit:
- self.setup()
- return self.get_location()
-
- update = install
- def setup(self):
+ def install(self):
if not self.online:
- return
+ return self.get_location()
options = self.options
@@ -89,7 +69,7 @@
os.path.isdir(os.path.join(
self.options['build-directory'], req.key))]
if len(dists) > 0:
- args = ['-c', easy_install._easy_install_cmd]
+ args = ['-c', zc.buildout.easy_install._easy_install_cmd]
if options.get('unzip') == 'true':
args += ['-Z']
@@ -124,6 +104,10 @@
req.key)
for req in self.reqs))
+ return self.get_location()
+
+ update = install
+
def get_location(self):
if os.path.isdir(self.options['location']):
return self.options['location']
@@ -132,7 +116,7 @@
def get_online_versions(self):
options = self.options
- self.installer = easy_install.Installer(
+ self.installer = zc.buildout.easy_install.Installer(
links=self.links,
index = self.index,
executable = options['executable'],
@@ -162,6 +146,6 @@
def develop(self, setups):
for setup in setups:
self.buildout._logger.info("Develop: %r", setup)
- easy_install.develop(
+ zc.buildout.easy_install.develop(
setup=setup, dest=self.buildout['buildout'][
'develop-eggs-directory'])
Modified: z3c.recipe.egg_/trunk/z3c/recipe/egg/editable.txt
===================================================================
--- z3c.recipe.egg_/trunk/z3c/recipe/egg/editable.txt 2008-06-07 19:31:16 UTC (rev 87233)
+++ z3c.recipe.egg_/trunk/z3c/recipe/egg/editable.txt 2008-06-07 19:36:25 UTC (rev 87234)
@@ -41,9 +41,9 @@
... """ % dict(server=link_server))
>>> print system(buildout),
- Develop: '/sample-buildout/parts/demoneeded/demoneeded'
Uninstalling demoneeded.
Installing demoneeded.
+ Develop: '/sample-buildout/parts/demoneeded/demoneeded'
>>> ls(sample_buildout, 'develop-eggs')
- demoneeded.egg-link
@@ -61,7 +61,7 @@
... recipe = z3c.recipe.egg:editable
... find-links = %(server)s
... eggs = demoneeded
- ... demoupgraded
+ ... extdemo
... """ % dict(server=link_server))
>>> print system(buildout),
@@ -70,21 +70,32 @@
>>> ls(sample_buildout, 'parts', 'demoneeded')
d demoneeded
- d demoupgraded
+ d extdemo
If a new qualifying version is available then the part will be
reinstalled.
- >>> from z3c.recipe.egg.tests import tests
- >>> tests.create_sample_egg(sample_eggs, version='1.1')
+ >>> write(
+ ... sample_buildout, 'parts', 'demoneeded', 'demoneeded',
+ ... 'setup.py', """
+ ... from setuptools import setup
+ ... setup(name='demoneeded', py_modules=['eggrecipedemoneeded'],
+ ... zip_safe=True, version='1.3', author='bob',
+ ... url='bob', author_email='bob')
+ ... """)
+ >>> import os
+ >>> sdist(os.path.join(
+ ... sample_buildout, 'parts', 'demoneeded', 'demoneeded'),
+ ... sample_eggs)
+
>>> print system(buildout),
Uninstalling demoneeded.
Installing demoneeded.
>>> ls(sample_buildout, 'parts', 'demoneeded')
d demoneeded
- d demoupgraded
+ d extdemo
>>> cat(
... sample_buildout, 'parts', 'demoneeded', 'demoneeded',
@@ -103,7 +114,7 @@
>>> ls(sample_buildout, 'parts', 'demoneeded')
d demoneeded
- d demoupgraded
+ d extdemo
If the part is to be reinstalled and buildout is run in offline or
non-newest mode, the recipe does nothing.
@@ -134,7 +145,7 @@
... recipe = z3c.recipe.egg:editable
... find-links = %(server)s
... eggs = demoneeded
- ... demoupgraded
+ ... extdemo
... """ % dict(server=link_server))
>>> print system(buildout+' -o'),
@@ -157,7 +168,7 @@
... recipe = z3c.recipe.egg:editable
... find-links = %(server)s
... eggs = demoneeded
- ... demoupgraded
+ ... extdemo
... build-directory = src
... """ % dict(server=link_server))
@@ -168,7 +179,7 @@
>>> ls(sample_buildout, 'parts')
>>> ls(sample_buildout, 'src')
d demoneeded
- d demoupgraded
+ d extdemo
If the build directory is present, it will not be removed when the
part is installed preserving any changes.
@@ -190,7 +201,7 @@
... recipe = z3c.recipe.egg:editable
... find-links = %(server)s
... eggs = demoneeded
- ... demoupgraded
+ ... extdemo
... build-directory = src
... """ % dict(server=link_server))
@@ -200,7 +211,7 @@
>>> ls(sample_buildout, 'src')
d demoneeded
- d demoupgraded
+ d extdemo
>>> cat(
... sample_buildout, 'src', 'demoneeded', 'setup.py')
Modified: z3c.recipe.egg_/trunk/z3c/recipe/egg/setup.txt
===================================================================
--- z3c.recipe.egg_/trunk/z3c/recipe/egg/setup.txt 2008-06-07 19:31:16 UTC (rev 87233)
+++ z3c.recipe.egg_/trunk/z3c/recipe/egg/setup.txt 2008-06-07 19:36:25 UTC (rev 87234)
@@ -23,6 +23,7 @@
The seupt script is run with the specified arguments.
>>> print system(buildout),
+ Installing foo.
Running setup script '/sample-buildout/foo/setup.py'.
running sdist
running egg_info
@@ -48,7 +49,6 @@
tar -cf dist/foo-0.0.0.tar foo-0.0.0
gzip -f9 dist/foo-0.0.0.tar
removing 'foo-0.0.0' (and everything under it)
- Installing foo.
>>> ls(sample_buildout, 'foo', 'dist')
- foo-0.0.0.tar.gz
@@ -58,6 +58,7 @@
The setup script is also run on update.
>>> print system(buildout),
+ Updating foo.
Running setup script '/sample-buildout/foo/setup.py'.
running sdist
running egg_info
@@ -80,7 +81,6 @@
tar -cf dist/foo-0.0.0.tar foo-0.0.0
gzip -f9 dist/foo-0.0.0.tar
removing 'foo-0.0.0' (and everything under it)
- Updating foo.
>>> ls(sample_buildout, 'foo', 'dist')
- foo-0.0.0.tar.gz
@@ -106,6 +106,8 @@
Now the buildout will run the setup script on both.
>>> print system(buildout),
+ Uninstalling foo.
+ Installing foo.
Running setup script '/sample-buildout/foo/setup.py'.
running sdist
running egg_info
@@ -153,8 +155,6 @@
tar -cf dist/bar-0.0.0.tar bar-0.0.0
gzip -f9 dist/bar-0.0.0.tar
removing 'bar-0.0.0' (and everything under it)
- Uninstalling foo.
- Installing foo.
>>> ls(sample_buildout, 'foo', 'dist')
- foo-0.0.0.tar.gz
@@ -181,34 +181,13 @@
... """)
>>> print system(buildout),
- Develop: '/sample-buildout/foo'
- Develop: '/sample-buildout/bar'
Uninstalling foo.
Installing foo.
+ Develop: '/sample-buildout/foo'
+ Develop: '/sample-buildout/bar'
>>> ls(sample_buildout, 'develop-eggs')
- bar.egg-link
- foo.egg-link
- z3c.recipe.egg.egg-link
- zc.recipe.egg.egg-link
-
-If the init option is not True, the default, then the setup script
-will be run when the part is installed or updated rather than when it
-is initialized.
-
- >>> write(sample_buildout, 'buildout.cfg',
- ... """
- ... [buildout]
- ... parts = foo
- ...
- ... [foo]
- ... recipe = z3c.recipe.egg:setup
- ... setup = foo
- ... develop = true
- ... init = False
- ... """)
-
- >>> print system(buildout),
- Uninstalling foo.
- Installing foo.
- Develop: '/sample-buildout/foo'
Modified: z3c.recipe.egg_/trunk/z3c/recipe/egg/tests/tests.py
===================================================================
--- z3c.recipe.egg_/trunk/z3c/recipe/egg/tests/tests.py 2008-06-07 19:31:16 UTC (rev 87233)
+++ z3c.recipe.egg_/trunk/z3c/recipe/egg/tests/tests.py 2008-06-07 19:36:25 UTC (rev 87234)
@@ -1,33 +1,15 @@
-import unittest, os, shutil, tempfile
+import unittest, os, shutil
from zope.testing import doctest, renormalizing
import zc.buildout.testing
-from zc.recipe.egg import tests
+import zc.recipe.egg.tests
-versioned_dist_template = """
-from setuptools import setup
-setup(name=%r, zip_safe=False, version=%r,
- author='bob', url='bob', author_email='bob')
-"""
-
-def create_sample_egg(dest, template=versioned_dist_template,
- name='demoupgraded', version='1.0'):
- write = zc.buildout.testing.write
- tmp = tempfile.mkdtemp()
- try:
- write(tmp, 'README.txt', '')
- write(tmp, 'setup.py', template % (name, version))
- zc.buildout.testing.sdist(tmp, dest)
- finally:
- shutil.rmtree(tmp)
-
def setUp(test):
- tests.setUp(test)
+ zc.recipe.egg.tests.setUp(test)
zc.buildout.testing.install_develop('z3c.recipe.egg', test)
shutil.copytree(os.path.join(os.path.dirname(__file__), 'foo'),
'foo')
shutil.copytree(os.path.join(os.path.dirname(__file__), 'bar'),
'bar')
- create_sample_egg(test.globs['sample_eggs'])
def test_suite():
return doctest.DocFileSuite(
More information about the Checkins
mailing list