[Checkins] SVN: grokcore.xmlrpc/ ups.. moving wrong stuff
Christian Klinger
cklinger at novareto.de
Fri Nov 5 14:02:05 EDT 2010
Log message for revision 118238:
ups.. moving wrong stuff
Changed:
D grokcore.xmlrpc/LICENSE.txt
D grokcore.xmlrpc/README.txt
D grokcore.xmlrpc/bootstrap.py
D grokcore.xmlrpc/buildout.cfg
D grokcore.xmlrpc/setup.py
A grokcore.xmlrpc/trunk/LICENSE.txt
A grokcore.xmlrpc/trunk/README.txt
A grokcore.xmlrpc/trunk/bootstrap.py
A grokcore.xmlrpc/trunk/buildout.cfg
A grokcore.xmlrpc/trunk/setup.py
-=-
Deleted: grokcore.xmlrpc/LICENSE.txt
===================================================================
--- grokcore.xmlrpc/LICENSE.txt 2010-11-05 17:59:50 UTC (rev 118237)
+++ grokcore.xmlrpc/LICENSE.txt 2010-11-05 18:02:04 UTC (rev 118238)
@@ -1,44 +0,0 @@
-Zope Public License (ZPL) Version 2.1
-
-A copyright notice accompanies this license document that identifies the
-copyright holders.
-
-This license has been certified as open source. It has also been designated as
-GPL compatible by the Free Software Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions in source code must retain the accompanying copyright
-notice, this list of conditions, and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying copyright
-notice, this list of conditions, and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to endorse or promote
-products derived from this software without prior written permission from the
-copyright holders.
-
-4. The right to distribute this software or to use it for any purpose does not
-give you the right to use Servicemarks (sm) or Trademarks (tm) of the
-copyright
-holders. Use of them is covered by separate agreement with the copyright
-holders.
-
-5. If any files are modified, you must cause the modified files to carry
-prominent notices stating that you changed the files and the date of any
-change.
-
-Disclaimer
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: grokcore.xmlrpc/README.txt
===================================================================
--- grokcore.xmlrpc/README.txt 2010-11-05 17:59:50 UTC (rev 118237)
+++ grokcore.xmlrpc/README.txt 2010-11-05 18:02:04 UTC (rev 118238)
@@ -1,48 +0,0 @@
-Grok
-****
-
-What is grok?
-=============
-
-Grok is a smashing web framework based on `Zope Toolkit`_ technology.
-
-.. _`Zope Toolkit`: http://docs.zope.org/zopetoolkit
-
-Grok uses the Component Architecture and builds on Zope concepts like
-content objects (models), views, and adapters. Its simplicity lies in
-using **convention over configuration** and **sensible defaults** when
-wiring components together. That means neither a configuration
-language like ZCML nor a lot of repetition are needed to create a web
-application with grok.
-
-You can find out much more about Grok at our http://grok.zope.org
-website.
-
-Who is grok?
-============
-
-Grok is a friendly caveman from the Stone Age. He has a big club that
-he hunts mammoths with. He will also use this club to smash anything
-he doesn't like.
-
-"ME GROK SMASH ZCML!"
-
-Getting grok
-============
-
-The easiest way to get started with grok is to install the
-`grokproject <http://cheeseshop.python.org/pypi/grokproject>`_ package
-(e.g. via ``easy_install grokproject``) and then create a new project
-area by calling the ``grokproject`` script like so::
-
- $ grokproject MyProject
- ... many lines of output here
-
-This will create a project area in ``MyProject`` as well as download
-and install grok.
-
-You can also get grok from the subversion repository::
-
- svn co svn://svn.zope.org/repos/main/grok/trunk grok
-
-Then follow the instructions of ``INSTALL.txt``.
Deleted: grokcore.xmlrpc/bootstrap.py
===================================================================
--- grokcore.xmlrpc/bootstrap.py 2010-11-05 17:59:50 UTC (rev 118237)
+++ grokcore.xmlrpc/bootstrap.py 2010-11-05 18:02:04 UTC (rev 118238)
@@ -1,260 +0,0 @@
-##############################################################################
-#
-# 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)
Deleted: grokcore.xmlrpc/buildout.cfg
===================================================================
--- grokcore.xmlrpc/buildout.cfg 2010-11-05 17:59:50 UTC (rev 118237)
+++ grokcore.xmlrpc/buildout.cfg 2010-11-05 18:02:04 UTC (rev 118238)
@@ -1,80 +0,0 @@
-[buildout]
-extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
-parts =
- docs
- interpreter
- grokwiki
- mkdirs
- test
- zpasswd
- zope_conf site_zcml deploy_ini debug_ini
-develop =
- .
- grokdocs
- grokwiki
-versions = versions
-extensions = buildout.dumppickedversions
-
-[versions]
-grok =
-
-[docs]
-recipe = z3c.recipe.scripts
-eggs = grokdocs
-
-[interpreter]
-recipe = z3c.recipe.scripts
-eggs = grokwiki
- zest.releaser
-interpreter = grokpy
-
-[grokwiki]
-recipe = z3c.recipe.scripts
-eggs = grokwiki
- z3c.evalexception>=2.0
- Paste
- PasteScript
- PasteDeploy
-
-[mkdirs]
-recipe = z3c.recipe.mkdir
-paths =
- ${zope_conf:filestorage}
- ${zope_conf:logfiles}
-
-[test]
-recipe = zc.recipe.testrunner
-eggs =
- grok
- grok[test]
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = grokwiki
-module = zope.app.server.zpasswd
-method = main
-
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-filestorage = ${buildout:directory}/var/filestorage
-logfiles = ${buildout:directory}/var/log
-
-[site_zcml]
-recipe = z3c.recipe.template
-input = etc/site.zcml.in
-output = ${buildout:parts-directory}/etc/site.zcml
-
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
-
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
Deleted: grokcore.xmlrpc/setup.py
===================================================================
--- grokcore.xmlrpc/setup.py 2010-11-05 17:59:50 UTC (rev 118237)
+++ grokcore.xmlrpc/setup.py 2010-11-05 18:02:04 UTC (rev 118238)
@@ -1,92 +0,0 @@
-from setuptools import setup, find_packages
-import os
-
-def read(*rnames):
- return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-
-long_description = (
- read('README.txt')
- + '\n' +
- read('CHANGES.txt')
- + '\n' +
- 'Download\n'
- '********\n'
- )
-
-tests_require = [
- 'zope.app.wsgi',
- 'zope.configuration',
- 'zope.testing',
- ]
-
-setup(
- name='grok',
- version='1.4dev',
- author='Grok Team',
- author_email='grok-dev at zope.org',
- url='http://grok.zope.org',
- download_url='http://cheeseshop.python.org/pypi/grok/',
- description='Grok: Now even cavemen can use Zope 3!',
- long_description=long_description,
- license='ZPL',
- classifiers=[
- 'Environment :: Web Environment',
- 'Intended Audience :: Developers',
- 'License :: OSI Approved :: Zope Public License',
- 'Programming Language :: Python',
- 'Framework :: Zope3',
- ],
- packages=find_packages('src'),
- package_dir = {'': 'src'},
- include_package_data = True,
- zip_safe=False,
- install_requires=[
- 'ZODB3',
- 'grokcore.annotation >= 1.1',
- 'grokcore.component >= 2.1',
- 'grokcore.content',
- 'grokcore.formlib >= 1.4',
- 'grokcore.json',
- 'grokcore.message',
- 'grokcore.security >= 1.1',
- 'grokcore.site',
- 'grokcore.view',
- 'grokcore.view [security_publication]',
- 'grokcore.viewlet >= 1.3',
- 'martian >= 0.14',
- 'pytz',
- 'setuptools',
- 'simplejson',
- 'z3c.autoinclude',
- 'zc.catalog',
- 'zope.annotation',
- 'zope.app.appsetup',
- 'zope.app.http',
- 'zope.app.publication',
- 'zope.browserpage',
- 'zope.catalog',
- 'zope.component',
- 'zope.container',
- 'zope.contentprovider',
- 'zope.event',
- 'zope.exceptions',
- 'zope.i18n',
- 'zope.i18nmessageid',
- 'zope.interface',
- 'zope.intid',
- 'zope.keyreference',
- 'zope.lifecycleevent',
- 'zope.location',
- 'zope.login',
- 'zope.password',
- 'zope.principalregistry',
- 'zope.publisher',
- 'zope.schema',
- 'zope.security',
- 'zope.securitypolicy',
- 'zope.site',
- 'zope.traversing',
- ],
- tests_require=tests_require,
- extras_require={'test': tests_require},
-)
Copied: grokcore.xmlrpc/trunk/LICENSE.txt (from rev 118237, grokcore.xmlrpc/LICENSE.txt)
===================================================================
--- grokcore.xmlrpc/trunk/LICENSE.txt (rev 0)
+++ grokcore.xmlrpc/trunk/LICENSE.txt 2010-11-05 18:02:04 UTC (rev 118238)
@@ -0,0 +1,44 @@
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the
+copyright holders.
+
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
+
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: grokcore.xmlrpc/trunk/README.txt (from rev 118237, grokcore.xmlrpc/README.txt)
===================================================================
--- grokcore.xmlrpc/trunk/README.txt (rev 0)
+++ grokcore.xmlrpc/trunk/README.txt 2010-11-05 18:02:04 UTC (rev 118238)
@@ -0,0 +1,48 @@
+Grok
+****
+
+What is grok?
+=============
+
+Grok is a smashing web framework based on `Zope Toolkit`_ technology.
+
+.. _`Zope Toolkit`: http://docs.zope.org/zopetoolkit
+
+Grok uses the Component Architecture and builds on Zope concepts like
+content objects (models), views, and adapters. Its simplicity lies in
+using **convention over configuration** and **sensible defaults** when
+wiring components together. That means neither a configuration
+language like ZCML nor a lot of repetition are needed to create a web
+application with grok.
+
+You can find out much more about Grok at our http://grok.zope.org
+website.
+
+Who is grok?
+============
+
+Grok is a friendly caveman from the Stone Age. He has a big club that
+he hunts mammoths with. He will also use this club to smash anything
+he doesn't like.
+
+"ME GROK SMASH ZCML!"
+
+Getting grok
+============
+
+The easiest way to get started with grok is to install the
+`grokproject <http://cheeseshop.python.org/pypi/grokproject>`_ package
+(e.g. via ``easy_install grokproject``) and then create a new project
+area by calling the ``grokproject`` script like so::
+
+ $ grokproject MyProject
+ ... many lines of output here
+
+This will create a project area in ``MyProject`` as well as download
+and install grok.
+
+You can also get grok from the subversion repository::
+
+ svn co svn://svn.zope.org/repos/main/grok/trunk grok
+
+Then follow the instructions of ``INSTALL.txt``.
Copied: grokcore.xmlrpc/trunk/bootstrap.py (from rev 118237, grokcore.xmlrpc/bootstrap.py)
===================================================================
--- grokcore.xmlrpc/trunk/bootstrap.py (rev 0)
+++ grokcore.xmlrpc/trunk/bootstrap.py 2010-11-05 18:02:04 UTC (rev 118238)
@@ -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)
Copied: grokcore.xmlrpc/trunk/buildout.cfg (from rev 118237, grokcore.xmlrpc/buildout.cfg)
===================================================================
--- grokcore.xmlrpc/trunk/buildout.cfg (rev 0)
+++ grokcore.xmlrpc/trunk/buildout.cfg 2010-11-05 18:02:04 UTC (rev 118238)
@@ -0,0 +1,80 @@
+[buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
+parts =
+ docs
+ interpreter
+ grokwiki
+ mkdirs
+ test
+ zpasswd
+ zope_conf site_zcml deploy_ini debug_ini
+develop =
+ .
+ grokdocs
+ grokwiki
+versions = versions
+extensions = buildout.dumppickedversions
+
+[versions]
+grok =
+
+[docs]
+recipe = z3c.recipe.scripts
+eggs = grokdocs
+
+[interpreter]
+recipe = z3c.recipe.scripts
+eggs = grokwiki
+ zest.releaser
+interpreter = grokpy
+
+[grokwiki]
+recipe = z3c.recipe.scripts
+eggs = grokwiki
+ z3c.evalexception>=2.0
+ Paste
+ PasteScript
+ PasteDeploy
+
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+ ${zope_conf:filestorage}
+ ${zope_conf:logfiles}
+
+[test]
+recipe = zc.recipe.testrunner
+eggs =
+ grok
+ grok[test]
+defaults = ['--tests-pattern', '^f?tests$', '-v']
+
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.dev:script
+eggs = grokwiki
+module = zope.app.server.zpasswd
+method = main
+
+[zope_conf]
+recipe = z3c.recipe.template
+input = etc/zope.conf.in
+output = ${buildout:parts-directory}/etc/zope.conf
+filestorage = ${buildout:directory}/var/filestorage
+logfiles = ${buildout:directory}/var/log
+
+[site_zcml]
+recipe = z3c.recipe.template
+input = etc/site.zcml.in
+output = ${buildout:parts-directory}/etc/site.zcml
+
+[deploy_ini]
+recipe = z3c.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+
+[debug_ini]
+recipe = z3c.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
Copied: grokcore.xmlrpc/trunk/setup.py (from rev 118237, grokcore.xmlrpc/setup.py)
===================================================================
--- grokcore.xmlrpc/trunk/setup.py (rev 0)
+++ grokcore.xmlrpc/trunk/setup.py 2010-11-05 18:02:04 UTC (rev 118238)
@@ -0,0 +1,92 @@
+from setuptools import setup, find_packages
+import os
+
+def read(*rnames):
+ return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
+long_description = (
+ read('README.txt')
+ + '\n' +
+ read('CHANGES.txt')
+ + '\n' +
+ 'Download\n'
+ '********\n'
+ )
+
+tests_require = [
+ 'zope.app.wsgi',
+ 'zope.configuration',
+ 'zope.testing',
+ ]
+
+setup(
+ name='grok',
+ version='1.4dev',
+ author='Grok Team',
+ author_email='grok-dev at zope.org',
+ url='http://grok.zope.org',
+ download_url='http://cheeseshop.python.org/pypi/grok/',
+ description='Grok: Now even cavemen can use Zope 3!',
+ long_description=long_description,
+ license='ZPL',
+ classifiers=[
+ 'Environment :: Web Environment',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Programming Language :: Python',
+ 'Framework :: Zope3',
+ ],
+ packages=find_packages('src'),
+ package_dir = {'': 'src'},
+ include_package_data = True,
+ zip_safe=False,
+ install_requires=[
+ 'ZODB3',
+ 'grokcore.annotation >= 1.1',
+ 'grokcore.component >= 2.1',
+ 'grokcore.content',
+ 'grokcore.formlib >= 1.4',
+ 'grokcore.json',
+ 'grokcore.message',
+ 'grokcore.security >= 1.1',
+ 'grokcore.site',
+ 'grokcore.view',
+ 'grokcore.view [security_publication]',
+ 'grokcore.viewlet >= 1.3',
+ 'martian >= 0.14',
+ 'pytz',
+ 'setuptools',
+ 'simplejson',
+ 'z3c.autoinclude',
+ 'zc.catalog',
+ 'zope.annotation',
+ 'zope.app.appsetup',
+ 'zope.app.http',
+ 'zope.app.publication',
+ 'zope.browserpage',
+ 'zope.catalog',
+ 'zope.component',
+ 'zope.container',
+ 'zope.contentprovider',
+ 'zope.event',
+ 'zope.exceptions',
+ 'zope.i18n',
+ 'zope.i18nmessageid',
+ 'zope.interface',
+ 'zope.intid',
+ 'zope.keyreference',
+ 'zope.lifecycleevent',
+ 'zope.location',
+ 'zope.login',
+ 'zope.password',
+ 'zope.principalregistry',
+ 'zope.publisher',
+ 'zope.schema',
+ 'zope.security',
+ 'zope.securitypolicy',
+ 'zope.site',
+ 'zope.traversing',
+ ],
+ tests_require=tests_require,
+ extras_require={'test': tests_require},
+)
More information about the checkins
mailing list