--- a/.installed.cfg Mon Jul 09 13:48:07 2018 +0200
+++ b/.installed.cfg Fri Jul 20 13:17:08 2018 +0200
@@ -14,15 +14,15 @@
parts = package i18n pyflakes test
[package]
-__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pdistreport
+__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pshell
/home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/prequest
- /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pshell
- /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/ptweens
/home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pcreate
+ /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pviews
+ /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/ptweens
+ /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/proutes
+ /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pdistreport
/home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pserve
- /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pviews
- /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/proutes
-__buildout_signature__ = zc.recipe.egg-2.0.3-py3.5.egg setuptools-33.1.1-py3.5.egg zc.buildout-2.9.3-py3.5.egg
+__buildout_signature__ = zc.recipe.egg-d45dd885254d7f32ab7887f3b58424fb zc.buildout-d45dd885254d7f32ab7887f3b58424fb setuptools-d45dd885254d7f32ab7887f3b58424fb
_b = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin
_d = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/develop-eggs
_e = /var/local/env/pyams/eggs
@@ -38,9 +38,9 @@
[i18n]
__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pybabel
+ /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pot-create
/home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/polint
- /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pot-create
-__buildout_signature__ = zc.recipe.egg-2.0.3-py3.5.egg setuptools-33.1.1-py3.5.egg zc.buildout-2.9.3-py3.5.egg
+__buildout_signature__ = zc.recipe.egg-d45dd885254d7f32ab7887f3b58424fb zc.buildout-d45dd885254d7f32ab7887f3b58424fb setuptools-d45dd885254d7f32ab7887f3b58424fb
_b = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin
_d = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/develop-eggs
_e = /var/local/env/pyams/eggs
@@ -55,7 +55,7 @@
[pyflakes]
__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pyflakes
/home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/pyflakes
-__buildout_signature__ = zc.recipe.egg-2.0.3-py3.5.egg setuptools-33.1.1-py3.5.egg zc.buildout-2.9.3-py3.5.egg
+__buildout_signature__ = zc.recipe.egg-d45dd885254d7f32ab7887f3b58424fb zc.buildout-d45dd885254d7f32ab7887f3b58424fb setuptools-d45dd885254d7f32ab7887f3b58424fb
_b = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin
_d = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/develop-eggs
_e = /var/local/env/pyams/eggs
@@ -72,7 +72,7 @@
[test]
__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/parts/test
/home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin/test
-__buildout_signature__ = zc.recipe.testrunner-2.0.0-py3.5.egg zc.recipe.egg-2.0.3-py3.5.egg setuptools-33.1.1-py3.5.egg zope.testrunner-4.7.0-py3.5.egg zc.buildout-2.9.3-py3.5.egg zope.interface-4.4.1-py3.5-linux-x86_64.egg zope.exceptions-4.1.0-py3.5.egg six-e7e58fc36ac96295dcff9979007c0533
+__buildout_signature__ = six-d45dd885254d7f32ab7887f3b58424fb zc.recipe.testrunner-d45dd885254d7f32ab7887f3b58424fb zc.recipe.egg-d45dd885254d7f32ab7887f3b58424fb zc.buildout-d45dd885254d7f32ab7887f3b58424fb zope.exceptions-d45dd885254d7f32ab7887f3b58424fb zope.interface-d45dd885254d7f32ab7887f3b58424fb zope.testrunner-d45dd885254d7f32ab7887f3b58424fb setuptools-d45dd885254d7f32ab7887f3b58424fb
_b = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/bin
_d = /home/tflorac/Dropbox/src/PyAMS/pyams_zodbbrowser/develop-eggs
_e = /var/local/env/pyams/eggs
--- a/bootstrap.py Mon Jul 09 13:48:07 2018 +0200
+++ b/bootstrap.py Fri Jul 20 13:17:08 2018 +0200
@@ -25,7 +25,10 @@
from optparse import OptionParser
-tmpeggs = tempfile.mkdtemp()
+__version__ = '2015-07-01'
+# See zc.buildout's changelog if this version is up to date.
+
+tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
usage = '''\
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
@@ -35,18 +38,19 @@
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 --find-links to point to local resources, you can keep
+Note that by using --find-links to point to local resources, you can keep
this script from going over the network.
'''
parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", help="use a specific zc.buildout version")
-
+parser.add_option("--version",
+ action="store_true", default=False,
+ help=("Return bootstrap.py version."))
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 "
+ help=("Normally, if you do not specify a --buildout-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 "
@@ -59,36 +63,57 @@
parser.add_option("--allow-site-packages",
action="store_true", default=False,
help=("Let bootstrap.py use existing site packages"))
-
+parser.add_option("--buildout-version",
+ help="Use a specific zc.buildout version")
+parser.add_option("--setuptools-version",
+ help="Use a specific setuptools version")
+parser.add_option("--setuptools-to-dir",
+ help=("Allow for re-use of existing directory of "
+ "setuptools versions"))
options, args = parser.parse_args()
+if options.version:
+ print("bootstrap.py version %s" % __version__)
+ sys.exit(0)
+
######################################################################
# load/install setuptools
try:
- if options.allow_site_packages:
- import setuptools
- import pkg_resources
from urllib.request import urlopen
except ImportError:
from urllib2 import urlopen
ez = {}
-exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
+if os.path.exists('ez_setup.py'):
+ exec(open('ez_setup.py').read(), ez)
+else:
+ exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
if not options.allow_site_packages:
# ez_setup imports site, which adds site packages
- # this will remove them from the path to ensure that incompatible versions
+ # this will remove them from the path to ensure that incompatible versions
# of setuptools are not in the path
import site
- # inside a virtualenv, there is no 'getsitepackages'.
+ # inside a virtualenv, there is no 'getsitepackages'.
# We can't remove these reliably
if hasattr(site, 'getsitepackages'):
for sitepackage_path in site.getsitepackages():
- sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
+ # Strip all site-packages directories from sys.path that
+ # are not sys.prefix; this is because on Windows
+ # sys.prefix is a site-package directory.
+ if sitepackage_path != sys.prefix:
+ sys.path[:] = [x for x in sys.path
+ if sitepackage_path not in x]
setup_args = dict(to_dir=tmpeggs, download_delay=0)
+
+if options.setuptools_version is not None:
+ setup_args['version'] = options.setuptools_version
+if options.setuptools_to_dir is not None:
+ setup_args['to_dir'] = options.setuptools_to_dir
+
ez['use_setuptools'](**setup_args)
import setuptools
import pkg_resources
@@ -104,7 +129,12 @@
ws = pkg_resources.working_set
+setuptools_path = ws.find(
+ pkg_resources.Requirement.parse('setuptools')).location
+
+# Fix sys.path here as easy_install.pth added before PYTHONPATH
cmd = [sys.executable, '-c',
+ 'import sys; sys.path[0:0] = [%r]; ' % setuptools_path +
'from setuptools.command.easy_install import main; main()',
'-mZqNxd', tmpeggs]
@@ -117,21 +147,23 @@
if find_links:
cmd.extend(['-f', find_links])
-setuptools_path = ws.find(
- pkg_resources.Requirement.parse('setuptools')).location
-
requirement = 'zc.buildout'
-version = options.version
+version = options.buildout_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
+ try:
+ return not parsed_version.is_prerelease
+ except AttributeError:
+ # Older setuptools
+ 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=[setuptools_path])
if find_links:
@@ -156,7 +188,7 @@
cmd.append(requirement)
import subprocess
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
+if subprocess.call(cmd) != 0:
raise Exception(
"Failed to execute command:\n%s" % repr(cmd)[1:-1])
--- a/docs/HISTORY.txt Mon Jul 09 13:48:07 2018 +0200
+++ b/docs/HISTORY.txt Fri Jul 20 13:17:08 2018 +0200
@@ -1,6 +1,10 @@
History
=======
+0.1.3
+-----
+ - renamed TALES expression
+
0.1.2
-----
- updated icon class
--- a/src/pyams_zodbbrowser.egg-info/PKG-INFO Mon Jul 09 13:48:07 2018 +0200
+++ b/src/pyams_zodbbrowser.egg-info/PKG-INFO Fri Jul 20 13:17:08 2018 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pyams-zodbbrowser
-Version: 0.1.2
+Version: 0.1.3
Summary: PyAMS ZODB browser integration
Home-page: http://hg.ztfy.org/pyams/pyams_zodbbrowser
Author: Thierry Florac
@@ -12,6 +12,10 @@
History
=======
+ 0.1.3
+ -----
+ - renamed TALES expression
+
0.1.2
-----
- updated icon class