@@ -7,3 +7,4 @@ Contributors: * Jannis Leidel <http://jezdez.com/> * Matthew R. Scott <http://http://goldenspud.com/rotr/> * Alexander Artemenko <http://aartemenko.com/> + * Taras Mankovski <http://taras.cc/> AUTHORS.txt @@ -24,6 +24,10 @@ branch If you want to stay up to date with a certain branch other than "master", use this. +paths + List of relative paths to packages to develop. Must be used together + with as_egg=true. + newest This overrides the newest-option of the global setting for this part README.rst @@ -6,7 +6,7 @@ setup( author_email='zerok@zerokspot.com', description='Simple zc.buildout recipe for sources in a git repository', long_description = open('README.rst', 'r').read(), - version='0.4.2', + version='0.5.0', url='http://github.com/zerok/zerokspot.gitrecipe/', install_requires=['setuptools', 'zc.buildout'], namespace_packages=['zerokspot'], setup.py @@ -6,6 +6,7 @@ subversion repositories:: [myapp] recipe = zerokspot.recipe.git repository = <url-of-repository> + paths = <relative-paths-to-packages-inside-repository> branch = <name-of-branch> # default: "master" rev = <name-of-revision> # default: None newest = [true|false] # default: false, stay up to date even when @@ -68,10 +69,15 @@ class Recipe(object): Revision that should be used. This is useful if you want to freeze the source at a given revision. If this is used, an update won't do all that much when executed. - + + paths + List of relative paths to packages to develop. Must be used together + with as_egg=true. + as_egg Set to True if you want the checkout to be registered as a development egg in your buildout. + """ def __init__(self, buildout, name, options): @@ -104,6 +110,7 @@ class Recipe(object): self.part_updated = False self.cache_cloned = False self.installed_from_cache = False + self.paths = options.get('paths', None) def install(self): """ @@ -225,6 +232,13 @@ class Recipe(object): """ Install clone as development egg. """ - path = self.options['location'] + def _install(path, target): + zc.buildout.easy_install.develop(path, target) + target = self.buildout['buildout']['develop-eggs-directory'] - zc.buildout.easy_install.develop(path, target) + if self.paths: + for path in self.paths.split(): + path = os.path.join(self.options['location'], path.strip()) + _install(path, target) + else: + _install(self.options['location'], target) zerokspot/recipe/git/__init__.py @@ -5,6 +5,13 @@ import tempfile from zc.buildout import testing import zc.buildout +def do_buildout(buildout_file, options=None): + if options is None: + options = [] + build = zc.buildout.buildout.Buildout(buildout_file, options) + build.init(None) + build.install(None) + return build class UtilsTests(unittest.TestCase): """ @@ -78,12 +85,7 @@ class RecipeTests(unittest.TestCase): testing.rmdir(self.temprepos) def _buildout(self, options=None): - if options is None: - options = [] - build = zc.buildout.buildout.Buildout(os.path.join(self.tempdir, 'buildout.cfg'), options) - build.init(None) - build.install(None) - return build + return do_buildout(os.path.join(self.tempdir, 'buildout.cfg'), options) def testFetch(self): """ @@ -183,6 +185,43 @@ as_egg = true installs = os.listdir(buildout['buildout']['develop-eggs-directory']) self.assertTrue('zerokspot.recipe.git.egg-link' in installs) +class MultiEggTests(unittest.TestCase): + def setUp(self): + self.projectdir = tempfile.mkdtemp() + self.temprepo = tempfile.mkdtemp() + for i in range(2): + base_dir = os.path.join(self.temprepo, 'project%d' % (i, )) + testing.mkdir(base_dir) + setup_py = '''from setuptools import setup +setup(name='project%(num)d', version='1.0', py_modules=['test'])''' % {'num': i} + with open(os.path.join(base_dir, 'setup.py'), 'w+') as fp: + fp.write(setup_py) + with open(os.path.join(base_dir, 'test.py'), 'w+') as fp: + fp.write('# Dummy module') + testing.system('cd %s && git init && git add * && git commit -m "Test"' % self.temprepo) + + def testBasic(self): + testing.write(self.projectdir, 'buildout.cfg', """ +[buildout] +parts = gittest + +[gittest] +recipe = zerokspot.recipe.git +repository = %(repo)s +as_egg = true +paths = + project0 + project1 +""" % {'repo': self.temprepo}) + buildout = do_buildout(os.path.join(self.projectdir, 'buildout.cfg')) + installs = os.listdir(buildout['buildout']['develop-eggs-directory']) + self.assertTrue('project0.egg-link' in installs) + self.assertTrue('project1.egg-link' in installs) + + def tearDown(self): + testing.rmdir(self.temprepo) + testing.rmdir(self.projectdir) + if __name__ == '__main__': sys.path.insert(0, os.path.normpath( os.path.join( zerokspot/recipe/git/tests.py 39e145ded5a1f8b4255a83367e8e3ddd2c791576 Horst Gutmann zerok@zerokspot.com http://github.com/zerok/zerokspot.gitrecipe/commit/2de92e2e5b5087a25a342726533eef79e1664680 2de92e2e5b5087a25a342726533eef79e1664680 2009-10-12T13:00:23-07:00 2009-10-12T13:00:23-07:00 Added patch by Taras Mankovski <http://taras.cc/> that adds support for multiple PyProject within on git repository + Some unittests b68a1a3891ef2d0ef0d313903c34318ca96b7455 Horst Gutmann zerok@zerokspot.com