[Checkins] SVN: megrok.z3ctable/trunk/ Using now grokcore.layout and z3c.table 2.0a1
Souheil Chelfouh
cvs-admin at zope.org
Fri Nov 8 15:06:20 CET 2013
Log message for revision 130354:
Using now grokcore.layout and z3c.table 2.0a1
Changed:
U megrok.z3ctable/trunk/bootstrap.py
U megrok.z3ctable/trunk/buildout.cfg
U megrok.z3ctable/trunk/docs/HISTORY.txt
U megrok.z3ctable/trunk/setup.py
U megrok.z3ctable/trunk/src/megrok/z3ctable/README.txt
U megrok.z3ctable/trunk/src/megrok/z3ctable/tests/adapters.py
U megrok.z3ctable/trunk/src/megrok/z3ctable/tests/ftesting.zcml
U megrok.z3ctable/trunk/src/megrok/z3ctable/tests/implicit.py
U megrok.z3ctable/trunk/src/megrok/z3ctable/tests/views.py
-=-
Modified: megrok.z3ctable/trunk/bootstrap.py
===================================================================
--- megrok.z3ctable/trunk/bootstrap.py 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/bootstrap.py 2013-11-08 14:06:19 UTC (rev 130354)
@@ -16,40 +16,262 @@
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.
-
-$Id: bootstrap.py 90212 2008-08-25 14:15:22Z thefunny42 $
"""
-import os, shutil, sys, tempfile, urllib2
+import os, shutil, sys, tempfile, urllib, urllib2, subprocess
+from optparse import OptionParser
-tmpeggs = tempfile.mkdtemp()
+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 # imported because of its side effects
+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'
+distribute_source = 'https://bitbucket.org/pypa/setuptools/raw/f657df1f1ed46596d236376649c99a470662b4ba/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 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.insert(0, 'buildout:accept-buildout-test-releases=true')
+
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 urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
- ).read() in ez
- ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-
+ 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
+ if sys.version_info[:2] == (2, 4):
+ setup_args['version'] = '0.6.32'
+ 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 = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
+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 not find_links and options.accept_buildout_test_releases:
+ find_links = 'http://downloads.buildout.org/'
+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
-assert os.spawnle(
- os.P_WAIT, sys.executable, sys.executable,
- '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
+setup_requirement_path = ws.find(
+ pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+ os.environ,
+ PYTHONPATH=setup_requirement_path)
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+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 distv >= pkg_resources.parse_version('2dev'):
+ continue
+ 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 += '=='+version
+else:
+ requirement += '<2dev'
+
+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(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)
+
+# If there isn't already a command in the args, add bootstrap
+if not [a for a in args if '=' not in a]:
+ args.append('bootstrap')
+
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+ args[0:0] = ['-c', options.config_file]
+
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+ shutil.rmtree(eggs_dir)
Modified: megrok.z3ctable/trunk/buildout.cfg
===================================================================
--- megrok.z3ctable/trunk/buildout.cfg 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/buildout.cfg 2013-11-08 14:06:19 UTC (rev 130354)
@@ -1,11 +1,18 @@
[buildout]
develop = .
parts = test
-extends = http://grok.zope.org/releaseinfo/1.3/versions.cfg
+extends = http://grok.zope.org/releaseinfo/1.5.5/versions.cfg
versions = versions
newest = false
+allow-picked-versions = true
+extensions = buildout.dumppickedversions
+[versions]
+z3c.batching = 2.0.0
+z3c.table = 2.0.0a1
+
[test]
recipe = zc.recipe.testrunner
eggs = megrok.z3ctable [test]
defaults = ['--tests-pattern', '^f?tests$', '-v', '-c']
+
Modified: megrok.z3ctable/trunk/docs/HISTORY.txt
===================================================================
--- megrok.z3ctable/trunk/docs/HISTORY.txt 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/docs/HISTORY.txt 2013-11-08 14:06:19 UTC (rev 130354)
@@ -1,6 +1,12 @@
Changelog
=========
+1.6.0 (2013-10-08)
+------------------
+
+* Using now `grokcore.layout` instead of `megrok.layout`
+
+
1.5.0 (2011-01-31)
------------------
Modified: megrok.z3ctable/trunk/setup.py
===================================================================
--- megrok.z3ctable/trunk/setup.py 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/setup.py 2013-11-08 14:06:19 UTC (rev 130354)
@@ -1,10 +1,23 @@
from setuptools import setup, find_packages
import os
-version = '1.5.0'
+version = '1.6.0'
readme = open(os.path.join("src", "megrok", "z3ctable", "README.txt")).read()
history = open(os.path.join("docs", "HISTORY.txt")).read()
+
+install_requires = [
+ 'grokcore.component',
+ 'grokcore.layout',
+ 'grokcore.view >= 1.12',
+ 'martian',
+ 'setuptools',
+ 'z3c.table >= 0.8',
+ 'zope.component >= 3.9.1',
+ 'zope.publisher',
+ ],
+
+
test_requires = [
'zope.site',
'zope.browserpage',
@@ -16,6 +29,7 @@
'zope.traversing',
]
+
setup(name='megrok.z3ctable',
version=version,
description="A table component package for Grok based on z3c.table.",
@@ -38,16 +52,7 @@
namespace_packages=['megrok'],
include_package_data=True,
zip_safe=False,
- install_requires=[
- 'grokcore.component',
- 'grokcore.layout',
- 'grokcore.view >= 1.12',
- 'martian',
- 'setuptools',
- 'z3c.table >= 0.8',
- 'zope.component >= 3.9.1',
- 'zope.publisher',
- ],
+ install_requires=install_requires,
extras_require={'test': test_requires},
entry_points="""
# -*- Entry points: -*-
Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/README.txt
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/README.txt 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/README.txt 2013-11-08 14:06:19 UTC (rev 130354)
@@ -126,15 +126,15 @@
<table>
<thead>
<tr>
- <th>Name</th>
+ <th class="sorted-on ascending">Name</th>
</tr>
</thead>
<tbody>
<tr>
- <td>christian</td>
+ <td class="sorted-on ascending">christian</td>
</tr>
<tr>
- <td>trollfot</td>
+ <td class="sorted-on ascending">trollfot</td>
</tr>
</tbody>
</table>
Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/tests/adapters.py
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/tests/adapters.py 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/tests/adapters.py 2013-11-08 14:06:19 UTC (rev 130354)
@@ -46,18 +46,18 @@
<table>
<thead>
<tr>
- <th>Title</th>
+ <th class="sorted-on ascending">Title</th>
</tr>
</thead>
<tbody>
<tr>
- <td>Title: First</td>
+ <td class="sorted-on ascending">Title: First</td>
</tr>
<tr>
- <td>Title: Second</td>
+ <td class="sorted-on ascending">Title: Second</td>
</tr>
<tr>
- <td>Title: Third</td>
+ <td class="sorted-on ascending">Title: Third</td>
</tr>
</tbody>
</table>
@@ -70,7 +70,7 @@
<table>
<thead>
<tr>
- <th>X</th>
+ <th class="sorted-on ascending">X</th>
<th>Name</th>
<th>Number</th>
<th>edit</th>
@@ -78,19 +78,19 @@
</thead>
<tbody>
<tr>
- <td><input type="checkbox" class="checkbox-widget" name="table-checkBox-0-selectedItems" value="first" /></td>
+ <td class="sorted-on ascending"><input type="checkbox" class="checkbox-widget" name="table-checkBox-0-selectedItems" value="first" /></td>
<td>first</td>
<td>1</td>
<td><a href="http://127.0.0.1/container/first/edit">edit this item</a></td>
</tr>
<tr>
- <td><input type="checkbox" class="checkbox-widget" name="table-checkBox-0-selectedItems" value="second" /></td>
+ <td class="sorted-on ascending"><input type="checkbox" class="checkbox-widget" name="table-checkBox-0-selectedItems" value="second" /></td>
<td>second</td>
<td>2</td>
<td><a href="http://127.0.0.1/container/second/edit">edit this item</a></td>
</tr>
<tr>
- <td><input type="checkbox" class="checkbox-widget" name="table-checkBox-0-selectedItems" value="third" /></td>
+ <td class="sorted-on ascending"><input type="checkbox" class="checkbox-widget" name="table-checkBox-0-selectedItems" value="third" /></td>
<td>third</td>
<td>3</td>
<td><a href="http://127.0.0.1/container/third/edit">edit this item</a></td>
@@ -108,15 +108,15 @@
<table>
<thead>
<tr>
- <th>Name</th>
+ <th class="sorted-on ascending">Name</th>
</tr>
</thead>
<tbody>
<tr>
- <td></td>
+ <td class="sorted-on ascending"></td>
</tr>
<tr>
- <td></td>
+ <td class="sorted-on ascending"></td>
</tr>
</tbody>
</table>
Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/tests/ftesting.zcml
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/tests/ftesting.zcml 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/tests/ftesting.zcml 2013-11-08 14:06:19 UTC (rev 130354)
@@ -3,17 +3,13 @@
xmlns:grok="http://namespaces.zope.org/grok">
<include package="grokcore.view" file="meta.zcml" />
- <include package="megrok.layout" file="meta.zcml"/>
+ <include package="grokcore.layout" file="meta.zcml"/>
<include package="zope.browserpage" file="meta.zcml" />
<include package="zope.component" file="meta.zcml" />
<include package="zope.security" file="meta.zcml" />
<include package="grokcore.view"/>
<include package="z3c.table"/>
- <include package="zope.container" />
- <include package="zope.security" />
- <include package="zope.traversing" />
- <include package="zope.traversing.browser" />
<include package="megrok.z3ctable" file="meta.zcml"/>
<grok:grok package="megrok.z3ctable.tests" />
Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/tests/implicit.py
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/tests/implicit.py 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/tests/implicit.py 2013-11-08 14:06:19 UTC (rev 130354)
@@ -21,12 +21,12 @@
<table>
<thead>
<tr>
- <th>Mongo</th>
+ <th class="sorted-on ascending">Mongo</th>
</tr>
</thead>
<tbody>
<tr>
- <td>I'm dumb</td>
+ <td class="sorted-on ascending">I'm dumb</td>
</tr>
</tbody>
</table>
Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/tests/views.py
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/tests/views.py 2013-11-07 13:19:45 UTC (rev 130353)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/tests/views.py 2013-11-08 14:06:19 UTC (rev 130354)
@@ -27,23 +27,22 @@
<table>
<thead>
<tr>
- <th>Name</th>
+ <th class="sorted-on ascending">Name</th>
</tr>
</thead>
<tbody>
<tr>
- <td>first</td>
+ <td class="sorted-on ascending">first</td>
</tr>
<tr>
- <td>second</td>
+ <td class="sorted-on ascending">second</td>
</tr>
<tr>
- <td>third</td>
+ <td class="sorted-on ascending">third</td>
</tr>
</tbody>
</table>
-
>>> tvwt = getMultiAdapter((cont, TestRequest()), name=u'tvwt')
>>> print tvwt()
<html>
@@ -52,18 +51,18 @@
<table>
<thead>
<tr>
- <th>Name</th>
+ <th class="sorted-on ascending">Name</th>
</tr>
</thead>
<tbody>
<tr>
- <td>first</td>
+ <td class="sorted-on ascending">first</td>
</tr>
<tr>
- <td>second</td>
+ <td class="sorted-on ascending">second</td>
</tr>
<tr>
- <td>third</td>
+ <td class="sorted-on ascending">third</td>
</tr>
</tbody>
</table>
@@ -80,22 +79,22 @@
<table>
<thead>
<tr>
- <th>Name</th>
+ <th class="sorted-on ascending">Name</th>
<th>Number</th>
</tr>
</thead>
<tbody>
<tr>
+ <td class="sorted-on ascending"></td>
<td></td>
- <td></td>
</tr>
<tr>
+ <td class="sorted-on ascending"></td>
<td></td>
- <td></td>
</tr>
<tr>
+ <td class="sorted-on ascending"></td>
<td></td>
- <td></td>
</tr>
</tbody>
</table>
@@ -114,18 +113,18 @@
<div class="layout"><table>
<thead>
<tr>
- <th>Title</th>
+ <th class="sorted-on ascending">Title</th>
</tr>
</thead>
<tbody>
<tr>
- <td>first</td>
+ <td class="sorted-on ascending">first</td>
</tr>
<tr>
- <td>second</td>
+ <td class="sorted-on ascending">second</td>
</tr>
<tr>
- <td>third</td>
+ <td class="sorted-on ascending">third</td>
</tr>
</tbody>
</table></div>
More information about the checkins
mailing list