Skip to content
Browse files

Add initial buildout with associated changes

  • Loading branch information...
1 parent b994f0a commit 670a448cfe8f46bf82355d6d4ec3397b078aa116 Jamie Chen committed Oct 27, 2011
Showing with 470 additions and 130 deletions.
  1. +260 −0 bootstrap.py
  2. +64 −0 buildout.cfg
  3. +1 −1 control-cc → control_cc
  4. +0 −41 scripts/control-cc.py
  5. +43 −0 scripts/control_cc.py
  6. +88 −84 scripts/generate_interfaces.py
  7. +4 −2 scripts/pycc.py
  8. +10 −2 setup.py
View
260 bootstrap.py
@@ -0,0 +1,260 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+"""
+
+import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+from optparse import OptionParser
+
+if sys.platform == 'win32':
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ quote = str
+
+# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
+stdout, stderr = subprocess.Popen(
+ [sys.executable, '-Sc',
+ 'try:\n'
+ ' import ConfigParser\n'
+ 'except ImportError:\n'
+ ' print 1\n'
+ 'else:\n'
+ ' print 0\n'],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+has_broken_dash_S = bool(int(stdout.strip()))
+
+# In order to be more robust in the face of system Pythons, we want to
+# run without site-packages loaded. This is somewhat tricky, in
+# particular because Python 2.6's distutils imports site, so starting
+# with the -S flag is not sufficient. However, we'll start with that:
+if not has_broken_dash_S and 'site' in sys.modules:
+ # We will restart with python -S.
+ args = sys.argv[:]
+ args[0:0] = [sys.executable, '-S']
+ args = map(quote, args)
+ os.execv(sys.executable, args)
+# Now we are running with -S. We'll get the clean sys.path, import site
+# because distutils will do it later, and then reset the path and clean
+# out any namespace packages from site-packages that might have been
+# loaded by .pth files.
+clean_path = sys.path[:]
+import site
+sys.path[:] = clean_path
+for k, v in sys.modules.items():
+ if k in ('setuptools', 'pkg_resources') or (
+ hasattr(v, '__path__') and
+ len(v.__path__)==1 and
+ not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+ # This is a namespace package. Remove it.
+ sys.modules.pop(k)
+
+is_jython = sys.platform.startswith('java')
+
+setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
+distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
+# parsing arguments
+def normalize_to_url(option, opt_str, value, parser):
+ if value:
+ if '://' not in value: # It doesn't smell like a URL.
+ value = 'file://%s' % (
+ urllib.pathname2url(
+ os.path.abspath(os.path.expanduser(value))),)
+ if opt_str == '--download-base' and not value.endswith('/'):
+ # Download base needs a trailing slash to make the world happy.
+ value += '/'
+ else:
+ value = None
+ name = opt_str[2:].replace('-', '_')
+ setattr(parser.values, name, value)
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --setup-source and --download-base to point to
+local resources, you can keep this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="use_distribute", default=False,
+ help="Use Distribute rather than Setuptools.")
+parser.add_option("--setup-source", action="callback", dest="setup_source",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or file location for the setup file. "
+ "If you use Setuptools, this will default to " +
+ setuptools_source + "; if you use Distribute, this "
+ "will default to " + distribute_source +"."))
+parser.add_option("--download-base", action="callback", dest="download_base",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or directory for downloading "
+ "zc.buildout and either Setuptools or Distribute. "
+ "Defaults to PyPI."))
+parser.add_option("--eggs",
+ help=("Specify a directory for storing eggs. Defaults to "
+ "a temporary directory that is deleted when the "
+ "bootstrap script completes."))
+parser.add_option("-t", "--accept-buildout-test-releases",
+ dest='accept_buildout_test_releases',
+ action="store_true", default=False,
+ help=("Normally, if you do not specify a --version, the "
+ "bootstrap script and buildout gets the newest "
+ "*final* versions of zc.buildout and its recipes and "
+ "extensions for you. If you use this flag, "
+ "bootstrap and buildout will get the newest releases "
+ "even if they are alphas or betas."))
+parser.add_option("-c", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.eggs:
+ eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
+else:
+ eggs_dir = tempfile.mkdtemp()
+
+if options.setup_source is None:
+ if options.use_distribute:
+ options.setup_source = distribute_source
+ else:
+ options.setup_source = setuptools_source
+
+if options.accept_buildout_test_releases:
+ args.append('buildout:accept-buildout-test-releases=true')
+args.append('bootstrap')
+
+try:
+ import pkg_resources
+ import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ if not hasattr(pkg_resources, '_distribute'):
+ raise ImportError
+except ImportError:
+ ez_code = urllib2.urlopen(
+ options.setup_source).read().replace('\r\n', '\n')
+ ez = {}
+ exec ez_code in ez
+ setup_args = dict(to_dir=eggs_dir, download_delay=0)
+ if options.download_base:
+ setup_args['download_base'] = options.download_base
+ if options.use_distribute:
+ setup_args['no_fake'] = True
+ ez['use_setuptools'](**setup_args)
+ if 'pkg_resources' in sys.modules:
+ reload(sys.modules['pkg_resources'])
+ import pkg_resources
+ # This does not (always?) update the default working set. We will
+ # do it.
+ for path in sys.path:
+ if path not in pkg_resources.working_set.entries:
+ pkg_resources.working_set.add_entry(path)
+
+cmd = [quote(sys.executable),
+ '-c',
+ quote('from setuptools.command.easy_install import main; main()'),
+ '-mqNxd',
+ quote(eggs_dir)]
+
+if not has_broken_dash_S:
+ cmd.insert(1, '-S')
+
+find_links = options.download_base
+if not find_links:
+ find_links = os.environ.get('bootstrap-testing-find-links')
+if find_links:
+ cmd.extend(['-f', quote(find_links)])
+
+if options.use_distribute:
+ setup_requirement = 'distribute'
+else:
+ setup_requirement = 'setuptools'
+ws = pkg_resources.working_set
+setup_requirement_path = ws.find(
+ pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+ os.environ,
+ PYTHONPATH=setup_requirement_path)
+
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+ # Figure out the most recent final version of zc.buildout.
+ import setuptools.package_index
+ _final_parts = '*final-', '*final'
+ def _final_version(parsed_version):
+ for part in parsed_version:
+ if (part[:1] == '*') and (part not in _final_parts):
+ return False
+ return True
+ index = setuptools.package_index.PackageIndex(
+ search_path=[setup_requirement_path])
+ if find_links:
+ index.add_find_links((find_links,))
+ req = pkg_resources.Requirement.parse(requirement)
+ if index.obtain(req) is not None:
+ best = []
+ bestv = None
+ for dist in index[req.project_name]:
+ distv = dist.parsed_version
+ if _final_version(distv):
+ if bestv is None or distv > bestv:
+ best = [dist]
+ bestv = distv
+ elif distv == bestv:
+ best.append(dist)
+ if best:
+ best.sort()
+ version = best[-1].version
+if version:
+ requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+if is_jython:
+ import subprocess
+ exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+ exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+ sys.stdout.flush()
+ sys.stderr.flush()
+ print ("An error occurred when trying to install zc.buildout. "
+ "Look above this message for any errors that "
+ "were output by easy_install.")
+ sys.exit(exitcode)
+
+ws.add_entry(eggs_dir)
+ws.require(requirement)
+import zc.buildout.buildout
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+ shutil.rmtree(eggs_dir)
View
64 buildout.cfg
@@ -0,0 +1,64 @@
+[buildout]
+develop =
+ .
+
+parts =
+ pyzmq
+ pyyaml
+ gevent
+ python
+
+unzip = true
+
+# extends = versions.cfg
+versions = versions
+
+# Using our server instead of Pypi for indexing when Pypi goes wrong
+# index = http://ooici.net/releases
+
+# When set to false, buildout and its recipe versions must be
+# explicitly pinned down and defined.
+allow-picked-versions = true
+
+# Useful line to print out the buildout versions you are using
+extensions = buildout-versions
+
+# Tells buildout where to download packages in addition to Pypi.
+find-links =
+ http://ooici.net/releases
+
+# Use this section only if you want to override the
+# versions in the parent file.
+[versions]
+setuptools=0.6c11
+pyzmq=2.1.7
+pyyaml=3.10
+gevent=0.13.6
+
+# Added specific include dir to work with brew install on Mac
+[pyzmq]
+recipe = zc.recipe.egg:custom
+include-dirs = /usr/local/include
+
+# Added specific include dir to work with brew install on Mac
+[pyyaml]
+recipe = zc.recipe.egg:custom
+include-dirs = /usr/local/include
+
+# Added specific include dir to work with brew install on Mac
+[gevent]
+recipe = zc.recipe.egg:custom
+include-dirs = /usr/local/include
+
+[python]
+recipe = zc.recipe.egg:scripts
+interpreter = python
+scripts =
+ nosetests
+ pycc
+ control_cc
+ generate_interfaces
+entry-points =
+ nosetests=nose:run_exit
+eggs =
+ pyon
View
2 control-cc → control_cc
@@ -4,4 +4,4 @@ ARGS=$@
if [ -z "$ARGS" ]; then
ARGS=""
fi
-python scripts/control-cc.py $ARGS
+python scripts/control_cc.py $ARGS
View
41 scripts/control-cc.py
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-
-__author__ = 'Dave Foster <dfoster@asascience.com>'
-__license__ = 'Apache 2.0'
-
-# PYON CC CONTROLLER SCRIPT
-
-import argparse
-import msgpack
-import os
-from pyon.net.endpoint import RPCClient
-from pyon.container.cc import IContainerAgent
-from pyon.net.messaging import makeNode
-
-parser = argparse.ArgumentParser(description="CC Control script")
-parser.add_argument("pidfile", help="pidfile to use. If not specified, uses the first one found.")
-parser.add_argument("command", help="command to send to the container agent", choices=IContainerAgent.names())
-parser.add_argument("commandargs", metavar="arg", nargs="*", help="arguments to the command being sent")
-
-opts = parser.parse_args()
-
-pidfile = opts.pidfile
-if not pidfile:
- raise Exception("No pidfile specified")
-
-parms = {}
-with open(pidfile, 'r') as pf:
- parms = msgpack.loads(pf.read())
-
-assert parms, "No content in pidfile"
-
-node, ioloop = makeNode(parms['messaging'])
-cc = RPCClient(node=node, name=(parms['container-xp'], parms['container-agent']), iface=IContainerAgent)
-
-meth = getattr(cc, opts.command)
-retval = meth(*opts.commandargs)
-
-print "Returned", retval
-node.client.close()
-
-
View
43 scripts/control_cc.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+__author__ = 'Dave Foster <dfoster@asascience.com>'
+__license__ = 'Apache 2.0'
+
+# PYON CC CONTROLLER SCRIPT
+
+import argparse
+import msgpack
+import os
+from pyon.net.endpoint import RPCClient
+from pyon.container.cc import IContainerAgent
+from pyon.net.messaging import makeNode
+
+def main():
+ parser = argparse.ArgumentParser(description="CC Control script")
+ parser.add_argument("pidfile", help="pidfile to use. If not specified, uses the first one found.")
+ parser.add_argument("command", help="command to send to the container agent", choices=IContainerAgent.names())
+ parser.add_argument("commandargs", metavar="arg", nargs="*", help="arguments to the command being sent")
+
+ opts = parser.parse_args()
+
+ pidfile = opts.pidfile
+ if not pidfile:
+ raise Exception("No pidfile specified")
+
+ parms = {}
+ with open(pidfile, 'r') as pf:
+ parms = msgpack.loads(pf.read())
+
+ assert parms, "No content in pidfile"
+
+ node, ioloop = makeNode(parms['messaging'])
+ cc = RPCClient(node=node, name=(parms['container-xp'], parms['container-agent']), iface=IContainerAgent)
+
+ meth = getattr(cc, opts.command)
+ retval = meth(*opts.commandargs)
+
+ print "Returned", retval
+ node.client.close()
+
+if __name__ == '__main__':
+ main()
View
172 scripts/generate_interfaces.py
@@ -77,90 +77,94 @@ def build_args_str(_def, include_self=True):
args_str = ', '.join(args)
return args_str
-if os.getcwd().endswith('scripts'):
- sys.exit('This script needs to be run from the pyon root.')
-
-service_dir, interface_dir = 'obj/services', 'interface'
-if not os.path.exists(interface_dir):
- os.makedirs(interface_dir)
-
-# Clear old generated files
-files = os.listdir(interface_dir)
-for file in fnmatch.filter(files, '*.py') + fnmatch.filter(files, '*.pyc'):
- os.unlink(os.path.join(interface_dir, file))
-
-open(os.path.join(interface_dir, '__init__.py'), 'w').close()
-
-# Load data yaml files in case services define interfaces
-# in terms of common data objects
-file_re = re.compile('(obj)/(.*)[.](yml)')
-data_dir = 'obj/data'
-for root, dirs, files in os.walk(data_dir):
- for filename in fnmatch.filter(files, '*.yml'):
- yaml_file = os.path.join(root, filename)
- file_match = file_re.match(yaml_file)
- if file_match is None: continue
-
- yaml_text = open(yaml_file, 'r').read()
- defs = yaml.load_all(yaml_text, Loader=IonYamlLoader)
- for def_set in defs:
- for name,_def in def_set.iteritems():
- tag = u'!%s' % (name)
- yaml.add_constructor(tag, lambda loader, node: {})
+def main():
+ if os.getcwd().endswith('scripts'):
+ sys.exit('This script needs to be run from the pyon root.')
+
+ service_dir, interface_dir = 'obj/services', 'interface'
+ if not os.path.exists(interface_dir):
+ os.makedirs(interface_dir)
+
+ # Clear old generated files
+ files = os.listdir(interface_dir)
+ for file in fnmatch.filter(files, '*.py') + fnmatch.filter(files, '*.pyc'):
+ os.unlink(os.path.join(interface_dir, file))
+
+ open(os.path.join(interface_dir, '__init__.py'), 'w').close()
+
+ # Load data yaml files in case services define interfaces
+ # in terms of common data objects
+ file_re = re.compile('(obj)/(.*)[.](yml)')
+ data_dir = 'obj/data'
+ for root, dirs, files in os.walk(data_dir):
+ for filename in fnmatch.filter(files, '*.yml'):
+ yaml_file = os.path.join(root, filename)
+ file_match = file_re.match(yaml_file)
+ if file_match is None: continue
+
+ yaml_text = open(yaml_file, 'r').read()
+ defs = yaml.load_all(yaml_text, Loader=IonYamlLoader)
+ for def_set in defs:
+ for name,_def in def_set.iteritems():
+ tag = u'!%s' % (name)
+ yaml.add_constructor(tag, lambda loader, node: {})
# Generate the new definitions, for now giving each
# yaml file its own python service
-for root, dirs, files in os.walk(service_dir):
- for filename in fnmatch.filter(files, '*.yml'):
- yaml_file = os.path.join(root, filename)
- file_match = file_re.match(yaml_file)
- if file_match is None: continue
-
- file_path = file_match.group(2)
- interface_base, interface_name = os.path.dirname(file_path), os.path.basename(file_path)
- print 'Generating "%s"...' % (interface_name)
- interface_file = os.path.join('interface', interface_base, 'i%s.py' % interface_name)
-
- parent_dir = os.path.dirname(interface_file)
- if not os.path.exists(parent_dir):
- os.makedirs(parent_dir)
- pkg_file = os.path.join(parent_dir, '__init__.py')
- if not os.path.exists(pkg_file):
- open(pkg_file, 'w').close()
-
- yaml_text = open(yaml_file, 'r').read()
- defs = yaml.load_all(yaml_text)
- for def_set in defs:
- # Handle object definitions first; make dummy constructors so tags will parse
- if 'obj' in def_set:
- for obj_name in def_set['obj']:
- tag = u'!%s' % (obj_name)
- yaml.add_constructor(tag, lambda loader, node: {})
- continue
-
- service_name = def_set.get('name', None)
- dependencies = def_set.get('dependencies', None)
- methods, class_methods = [], []
-
- for op_name,op_def in def_set.get('methods', {}).iteritems():
- if not op_def: continue
- def_in, def_out = op_def.get('in', None), op_def.get('out', None)
-
- args_str, class_args_str = build_args_str(def_in, False), build_args_str(def_in, True)
- outargs_str = '\n # '.join(yaml.dump(def_out).split('\n'))
-
- methods.append(templates['method'].format(name=op_name, args=args_str, outargs=outargs_str))
- class_methods.append(templates['method'].format(name=op_name, args=class_args_str, outargs=outargs_str))
-
- if service_name is None:
- raise IonServiceDefinitionError("Service definition file %s does not define name attribute" % yaml_file)
- service_name_str = templates['svcname'].format(name=service_name)
- dependencies_str = templates['depends'].format(namelist=dependencies)
- methods_str = ''.join(methods) or ' pass\n'
- classmethods_str = ''.join(class_methods)
- class_name = service_name_from_file_name(interface_name)
- _class = templates['class'].format(name=class_name, servicename=service_name_str, dependencies=dependencies_str,
- methods=methods_str, classmethods=classmethods_str)
-
- interface_contents = templates['file'].format(classes=_class)
- open(interface_file, 'w').write(interface_contents)
+ for root, dirs, files in os.walk(service_dir):
+ for filename in fnmatch.filter(files, '*.yml'):
+ yaml_file = os.path.join(root, filename)
+ file_match = file_re.match(yaml_file)
+ if file_match is None: continue
+
+ file_path = file_match.group(2)
+ interface_base, interface_name = os.path.dirname(file_path), os.path.basename(file_path)
+ print 'Generating "%s"...' % (interface_name)
+ interface_file = os.path.join('interface', interface_base, 'i%s.py' % interface_name)
+
+ parent_dir = os.path.dirname(interface_file)
+ if not os.path.exists(parent_dir):
+ os.makedirs(parent_dir)
+ pkg_file = os.path.join(parent_dir, '__init__.py')
+ if not os.path.exists(pkg_file):
+ open(pkg_file, 'w').close()
+
+ yaml_text = open(yaml_file, 'r').read()
+ defs = yaml.load_all(yaml_text)
+ for def_set in defs:
+ # Handle object definitions first; make dummy constructors so tags will parse
+ if 'obj' in def_set:
+ for obj_name in def_set['obj']:
+ tag = u'!%s' % (obj_name)
+ yaml.add_constructor(tag, lambda loader, node: {})
+ continue
+
+ service_name = def_set.get('name', None)
+ dependencies = def_set.get('dependencies', None)
+ methods, class_methods = [], []
+
+ for op_name,op_def in def_set.get('methods', {}).iteritems():
+ if not op_def: continue
+ def_in, def_out = op_def.get('in', None), op_def.get('out', None)
+
+ args_str, class_args_str = build_args_str(def_in, False), build_args_str(def_in, True)
+ outargs_str = '\n # '.join(yaml.dump(def_out).split('\n'))
+
+ methods.append(templates['method'].format(name=op_name, args=args_str, outargs=outargs_str))
+ class_methods.append(templates['method'].format(name=op_name, args=class_args_str, outargs=outargs_str))
+
+ if service_name is None:
+ raise IonServiceDefinitionError("Service definition file %s does not define name attribute" % yaml_file)
+ service_name_str = templates['svcname'].format(name=service_name)
+ dependencies_str = templates['depends'].format(namelist=dependencies)
+ methods_str = ''.join(methods) or ' pass\n'
+ classmethods_str = ''.join(class_methods)
+ class_name = service_name_from_file_name(interface_name)
+ _class = templates['class'].format(name=class_name, servicename=service_name_str, dependencies=dependencies_str,
+ methods=methods_str, classmethods=classmethods_str)
+
+ interface_contents = templates['file'].format(classes=_class)
+ open(interface_file, 'w').write(interface_contents)
+
+if __name__ == '__main__':
+ main()
View
6 scripts/pycc.py
@@ -133,7 +133,7 @@ def parse_args(tokens):
return args, kwargs
-if __name__ == '__main__':
+def entry():
#proc_types = GreenProcessSupervisor.type_callables.keys()
# NOTE: Resist the temptation to add manual parameters here! Most container config options
@@ -162,4 +162,6 @@ def parse_args(tokens):
main(opts, *args, **kwargs)
else:
main(opts, *args, **kwargs)
-
+
+if __name__ == '__main__':
+ entry()
View
12 setup.py
@@ -23,6 +23,14 @@
author = 'Adam R. Smith',
author_email = 'a2smith@ucsd.edu',
keywords = ['ooici','ioncore', 'pyon'],
+ packages = find_packages(),
+ entry_points = {
+ 'console_scripts' : [
+ 'pycc=scripts.pycc:entry',
+ 'control_cc=scripts.control_cc:main',
+ 'generate_interfaces=scripts.generate_interfaces:main'
+ ]
+ },
dependency_links = [
'http://ooici.net/releases'
],
@@ -36,10 +44,10 @@
'pyyaml==3.10',
'pika==0.9.5',
'httplib2==0.7.1',
- # 'pyzmq==2.1.7',
+ 'pyzmq==2.1.7',
'gevent_zeromq==0.2.0',
'HTTP4Store==0.3.1',
- 'zope.interface==3.6.4',
+ 'zope.interface',
'couchdb==0.8',
# 'lockfile==0.9.1',
'python-daemon==1.6',

0 comments on commit 670a448

Please sign in to comment.
Something went wrong with that request. Please try again.