# HG changeset patch # User Thierry Florac # Date 1524820730 -7200 # Node ID 81e7c46a70c85e39476c93ab294e498303806515 # Parent 4caa856eb5179b29b5da86ee3c00646177ccbc3d Version 0.1.15 diff -r 4caa856eb517 -r 81e7c46a70c8 .installed.cfg --- a/.installed.cfg Thu Apr 26 18:02:46 2018 +0200 +++ b/.installed.cfg Fri Apr 27 11:18:50 2018 +0200 @@ -9,21 +9,21 @@ /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-catalog.egg-link /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-form.egg-link /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-utils.egg-link -parts = package i18n pyflakes sphinx test +parts = package i18n pyflakes test [package] __buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/fanstatic-compile /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pyams_upgrade + /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pcreate + /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pserve + /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/proutes /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/prequest - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pdistreport - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pcreate /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/ptweens - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pserve /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pviews - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/proutes + /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pdistreport /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pshell /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/py -__buildout_signature__ = zc.recipe.egg-08018444d2c472b064e6d25c4c74d461 zc.buildout-2.10.0-py3.5.egg setuptools-08018444d2c472b064e6d25c4c74d461 +__buildout_signature__ = zc.recipe.egg-11c22812bb3b087b4ed50ae9cdd79d10 zc.buildout-11c22812bb3b087b4ed50ae9cdd79d10 setuptools-11c22812bb3b087b4ed50ae9cdd79d10 _b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin _d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs _e = /var/local/env/pyams/eggs @@ -54,7 +54,7 @@ __buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pybabel /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/polint /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pot-create -__buildout_signature__ = zc.recipe.egg-08018444d2c472b064e6d25c4c74d461 zc.buildout-2.10.0-py3.5.egg setuptools-08018444d2c472b064e6d25c4c74d461 +__buildout_signature__ = zc.recipe.egg-11c22812bb3b087b4ed50ae9cdd79d10 zc.buildout-11c22812bb3b087b4ed50ae9cdd79d10 setuptools-11c22812bb3b087b4ed50ae9cdd79d10 _b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin _d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs _e = /var/local/env/pyams/eggs @@ -69,7 +69,7 @@ [pyflakes] __buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pyflakes /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pyflakes -__buildout_signature__ = zc.recipe.egg-08018444d2c472b064e6d25c4c74d461 zc.buildout-2.10.0-py3.5.egg setuptools-08018444d2c472b064e6d25c4c74d461 +__buildout_signature__ = zc.recipe.egg-11c22812bb3b087b4ed50ae9cdd79d10 zc.buildout-11c22812bb3b087b4ed50ae9cdd79d10 setuptools-11c22812bb3b087b4ed50ae9cdd79d10 _b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin _d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs _e = /var/local/env/pyams/eggs @@ -83,27 +83,10 @@ recipe = zc.recipe.egg scripts = pyflakes -[sphinx] -__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/sphinx - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/apidoc/build/Makefile - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/apidoc/build/make.bat -__buildout_signature__ = imagesize-08018444d2c472b064e6d25c4c74d461 alabaster-08018444d2c472b064e6d25c4c74d461 docutils-08018444d2c472b064e6d25c4c74d461 collective.recipe.sphinxbuilder-08018444d2c472b064e6d25c4c74d461 MarkupSafe-08018444d2c472b064e6d25c4c74d461 sphinxcontrib-websupport-08018444d2c472b064e6d25c4c74d461 snowballstemmer-08018444d2c472b064e6d25c4c74d461 Sphinx-08018444d2c472b064e6d25c4c74d461 six-08018444d2c472b064e6d25c4c74d461 urllib3-08018444d2c472b064e6d25c4c74d461 zc.recipe.egg-08018444d2c472b064e6d25c4c74d461 Pygments-08018444d2c472b064e6d25c4c74d461 Babel-08018444d2c472b064e6d25c4c74d461 idna-08018444d2c472b064e6d25c4c74d461 Jinja2-08018444d2c472b064e6d25c4c74d461 zc.buildout-2.10.0-py3.5.egg requests-08018444d2c472b064e6d25c4c74d461 chardet-08018444d2c472b064e6d25c4c74d461 setuptools-08018444d2c472b064e6d25c4c74d461 pytz-08018444d2c472b064e6d25c4c74d461 certifi-08018444d2c472b064e6d25c4c74d461 -_b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin -_d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs -_e = /var/local/env/pyams/eggs -bin-directory = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin -build = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/apidoc/build -develop-eggs-directory = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs -eggs-directory = /var/local/env/pyams/eggs -find-links = http://download.ztfy.org/eggs -interpreter = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/py -recipe = collective.recipe.sphinxbuilder -source = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/apidoc/source - [test] __buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/parts/test /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/test -__buildout_signature__ = six-08018444d2c472b064e6d25c4c74d461 zc.recipe.testrunner-08018444d2c472b064e6d25c4c74d461 zc.recipe.egg-08018444d2c472b064e6d25c4c74d461 zc.buildout-2.10.0-py3.5.egg zope.exceptions-08018444d2c472b064e6d25c4c74d461 zope.interface-08018444d2c472b064e6d25c4c74d461 zope.testrunner-08018444d2c472b064e6d25c4c74d461 setuptools-08018444d2c472b064e6d25c4c74d461 +__buildout_signature__ = six-11c22812bb3b087b4ed50ae9cdd79d10 zc.recipe.testrunner-11c22812bb3b087b4ed50ae9cdd79d10 zc.recipe.egg-11c22812bb3b087b4ed50ae9cdd79d10 zc.buildout-11c22812bb3b087b4ed50ae9cdd79d10 zope.exceptions-11c22812bb3b087b4ed50ae9cdd79d10 zope.interface-11c22812bb3b087b4ed50ae9cdd79d10 zope.testrunner-11c22812bb3b087b4ed50ae9cdd79d10 setuptools-11c22812bb3b087b4ed50ae9cdd79d10 _b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin _d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs _e = /var/local/env/pyams/eggs diff -r 4caa856eb517 -r 81e7c46a70c8 bootstrap.py --- a/bootstrap.py Thu Apr 26 18:02:46 2018 +0200 +++ b/bootstrap.py Fri Apr 27 11:18:50 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]) diff -r 4caa856eb517 -r 81e7c46a70c8 buildout.cfg --- a/buildout.cfg Thu Apr 26 18:02:46 2018 +0200 +++ b/buildout.cfg Fri Apr 27 11:18:50 2018 +0200 @@ -34,7 +34,6 @@ package i18n pyflakes - sphinx test [package] @@ -76,12 +75,6 @@ on_install = true cmds = ${buildout:develop}/bin/${pyflakes:scripts} -[sphinx] -recipe = collective.recipe.sphinxbuilder -source = ${buildout:directory}/apidoc/source -build = ${buildout:directory}/apidoc/build -interpreter = ${buildout:directory}/bin/py - [test] recipe = zc.recipe.testrunner eggs = pyams_skin [test] diff -r 4caa856eb517 -r 81e7c46a70c8 docs/HISTORY.txt --- a/docs/HISTORY.txt Thu Apr 26 18:02:46 2018 +0200 +++ b/docs/HISTORY.txt Fri Apr 27 11:18:50 2018 +0200 @@ -1,6 +1,17 @@ History ======= +0.1.15 +------ + - renamed factories to use snake_case on functions + - refactored tables attributes management + - updated permission checks in container delete helper function + - updated default TinyMCE editor configuration (MyAMS.js) + - updated row refresh event (MyAMS.js) + - handle null events in JSON response (MyAMS.js) + - added check in Select2 plug-in to avoid multiple components initializations (MyAMS.js) + - added JSON events helpers functions + 0.1.14 ------ - added support for IObjectData interface on menu items and actions diff -r 4caa856eb517 -r 81e7c46a70c8 src/pyams_skin.egg-info/PKG-INFO --- a/src/pyams_skin.egg-info/PKG-INFO Thu Apr 26 18:02:46 2018 +0200 +++ b/src/pyams_skin.egg-info/PKG-INFO Fri Apr 27 11:18:50 2018 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pyams-skin -Version: 0.1.14 +Version: 0.1.15 Summary: PyAMS base skin interfaces and classes Home-page: http://hg.ztfy.org/pyams/pyams_skin Author: Thierry Florac @@ -23,6 +23,17 @@ History ======= + 0.1.15 + ------ + - renamed factories to use snake_case on functions + - refactored tables attributes management + - updated permission checks in container delete helper function + - updated default TinyMCE editor configuration (MyAMS.js) + - updated row refresh event (MyAMS.js) + - handle null events in JSON response (MyAMS.js) + - added check in Select2 plug-in to avoid multiple components initializations (MyAMS.js) + - added JSON events helpers functions + 0.1.14 ------ - added support for IObjectData interface on menu items and actions diff -r 4caa856eb517 -r 81e7c46a70c8 src/pyams_skin.egg-info/SOURCES.txt --- a/src/pyams_skin.egg-info/SOURCES.txt Thu Apr 26 18:02:46 2018 +0200 +++ b/src/pyams_skin.egg-info/SOURCES.txt Fri Apr 27 11:18:50 2018 +0200 @@ -8,6 +8,7 @@ src/pyams_skin/__init__.py src/pyams_skin/configuration.py src/pyams_skin/container.py +src/pyams_skin/event.py src/pyams_skin/extension.py src/pyams_skin/help.py src/pyams_skin/layer.py @@ -46,6 +47,7 @@ src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.po src/pyams_skin/resources/.dropbox src/pyams_skin/resources/css/myams.css +src/pyams_skin/resources/css/myams.css.map src/pyams_skin/resources/css/myams.min.css src/pyams_skin/resources/css/ext/bootstrap-3.3.2.css src/pyams_skin/resources/css/ext/bootstrap-3.3.2.min.css diff -r 4caa856eb517 -r 81e7c46a70c8 src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.mo Binary file src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.mo has changed