Merge zope4 branch changes.

software/neoppod/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 2bd1779425b7561682c0de5496d808ed
 
 [root-common]
 filename = root-common.cfg.in
-md5sum = 6af1e71b8474bc73d7a02305d391edeb
+md5sum = ae00507d9e69209a0babd725cf6be536
 
 [instance-neo-admin]
 filename = instance-neo-admin.cfg.in

stack/erp5/buildout-py3.cfg

 [buildout]
 extends =
   buildout.cfg
-# Exact versions from Zope 4
-  versions.cfg
-  versions-prod.cfg
 parts -=
   template-neo
   
@@ -13,6 +10,35 @@ parts +=
   slapos-cookbook
   zopescripts
 
+parts -=
+# XXX: The following parts have no support for Python 3. Ignore for now.
+  rdiff-backup
+  ocropy
+  hookbox
+  scipy
+  numpy
+  scikit-learn
+  scikit-image
+  PyWavelets
+  jupyter-notebook-initialized-scripts
+  jupyter
+  matplotlibrc
+  pandas
+  h5py
+  ipython
+  tesseract
+  tesseract-eng-traineddata
+  tesseract-osd-traineddata
+#  neoppod
+  testrunner
+  test_suite_runner
+  custom-js
+
+find-links +=
+  http://www.nexedi.org/static/packages/source/
+  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+
 [zopescripts]
 recipe = zc.recipe.egg
 interpreter = zopepy
@@ -51,29 +77,6 @@ part = python3
 develop = true
 branch = zope4
 
-parts -=
-# XXX: The following parts have no support for Python 3. Ignore for now.
-  rdiff-backup
-  ocropy
-  hookbox
-  scipy
-  numpy
-  scikit-learn
-  scikit-image
-  PyWavelets
-  jupyter-notebook-initialized-scripts
-  jupyter
-  matplotlibrc
-  pandas
-  h5py
-  ipython
-  tesseract
-  tesseract-eng-traineddata
-  tesseract-osd-traineddata
-#  neoppod
-  testrunner
-  test_suite_runner
-
 [test_suite_runner]
 recipe =   
 [testrunner]
@@ -178,9 +181,6 @@ Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acqu
 patches=
 
 [versions]
-# patched eggs
-#Acquisition = 4.6+SlapOSPatched001
-
 # zc.recipe.egg 2.0.7 (in versions.cfg) requires zc.buildout>=2.12.0, so let's
 # revert to the version contained in stack/slapos.cfg
 zc.recipe.egg = 2.0.3+slapos003
@@ -211,9 +211,6 @@ typed-ast = 1.4.0
 Products.SiteErrorLog = 5.4
 Products.PythonScripts = 4.12
 Products.DCWorkflow = 2.4.0+SlapOSPatched001
-lxml = 4.4.3 
-# This is the version of lxml building, I copy/paste the 4.6.1 from pip install instead
-# XXX it must be checked later
 xml_marshaller = 1.0.2
 mysqlclient = 2.0.1
 Products.ZSQLMethods = 3.0.10
@@ -223,4 +220,4 @@ Products.MimetypesRegistry = 2.1.8
 Products.CMFDefault = 2.2.4
 Products.PluggableAuthService = 2.3
 Products.PluginRegistry = 1.6
-polib = 1.1.0
+polib = 1.1.0
\ No newline at end of file

stack/erp5/buildout.hash.cfg

@@ -34,6 +34,39 @@ md5sum = fed6dd2bdc389b4fc7e7b7ca32c5d4b6
 
 [template-zope-conf]
 filename = zope.conf.in
+md5sum = 01c36a8963f65b85ca4b60e71fa89b33
+
+[site-zcml]
+filename = site.zcml
+md5sum = 43556e5bca8336dd543ae8068512aa6d
+
+[template-my-cnf]
+filename = my.cnf.in
+md5sum = 7944ec58a2c6ee74a56219bacebfd145
+
+[template-mariadb-initial-setup]
+filename = mariadb_initial_setup.sql.in
+md5sum = 1102c3e37a5a2e8aa2d8a2607ab633c8
+
+[template-postfix]
+filename = instance-postfix.cfg.in
+md5sum = 2a68a3e7c5c509cbd4cfa9e670ac91c7
+
+[template-postfix-master-cf]
+filename = postfix_master.cf.in
+md5sum = 9ac81647368068a1a98a785d08074b43
+
+[template-postfix-main-cf]
+filename = postfix_main.cf.in
+md5sum = 886d1b004049c8dc1f89cbbfe4f95371
+
+[template-postfix-aliases]
+filename = postfix_aliases.in
+md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
+
+[template-run-zelenium]
+filename = run-zelenium-test.py.in
+md5sum = 274365ebbade26558ca4836837e781aa
 
 [template]
 filename = instance.cfg.in
@@ -49,7 +82,7 @@ md5sum = 34491fdb370143192b4c167c9a73605b
 
 [template-zodb-base]
 filename = instance-zodb-base.cfg.in
-md5sum = bc821f9f9696953b10a03ad7b59a1936
+md5sum = 0ac4b74436f554cd677f19275d18d880
 
 [template-zope]
 filename = instance-zope.cfg.in

stack/erp5/instance-zodb-base.cfg.in

@@ -4,7 +4,7 @@
 {% set zodb_dict = slapparameter_dict['zodb-dict'] -%}
 
 {% set zeo_dict = slapparameter_dict.get('zodb-zeo', {}) -%}
-{% for name, zodb in zodb_dict.iteritems() -%}
+{% for name, zodb in six.iteritems(zodb_dict) -%}
 {%   set storage_dict = zodb.setdefault('storage-dict', {}) -%}
 {%   if zodb['type'] == 'zeo' -%}
 {%     do storage_dict.update(zeo_dict.get(name, ())) -%}

stack/erp5/run-zelenium-test.py.in

@@ -64,7 +64,7 @@ def main():
         if response.code == 200:
           static_dict = json.loads(response.read())
           activity_list = []
-          for _, value in static_dict.iteritems():
+          for _, value in six.iteritems(static_dict):
             activity_list += value['line_list']
           if len(activity_list) == 0:
             break

stack/erp5/versions-prod.cfg

-[buildout]
-# Version pins for required and commonly used dependencies.
-
-[versions]
-Zope = 4.1.3
-Zope2 = 4.0
-AccessControl = 4.2
-Acquisition = 4.6
-AuthEncoding = 4.1
-BTrees = 4.6.0
-Chameleon = 3.6.2
-DateTime = 4.3
-DocumentTemplate = 3.1b2
-ExtensionClass = 4.4
-Missing = 4.1
-MultiMapping = 4.1
-Paste = 3.1.1
-PasteDeploy = 2.0.1
-Persistence = 3.0
-Products.BTreeFolder2 = 4.2
-Products.ZCatalog = 5.0.1
-Record = 3.5
-RestrictedPython = 5.0
-WSGIProxy2 = 0.4.6
-WebOb = 1.8.5
-WebTest = 2.0.33
-ZConfig = 3.5.0
-ZEO = 5.2.1
-ZODB = 5.5.1
-ZServer = 4.0.2
-five.globalrequest = 99.1
-five.localsitemanager = 3.2.2
-funcsigs = 1.0.2
-future = 0.17.1
-ipaddress = 1.0.22
-mock = 3.0.5
-pbr = 5.4.2
-persistent = 4.5.0
-pytz = 2019.2
-roman = 3.2
-shutilwhich = 1.1.0
-six = 1.12.0
-transaction = 2.4.0
-waitress = 1.3.1
-z3c.pt = 3.2.0
-zExceptions = 4.1
-zc.lockfile = 2.0
-zdaemon = 4.3
-zodbpickle = 1.0.4
-zope.annotation = 4.7.0
-zope.browser = 2.3
-zope.browsermenu = 4.4
-zope.browserpage = 4.4.0
-zope.browserresource = 4.3
-zope.cachedescriptors = 4.3.1
-zope.component = 4.5
-zope.componentvocabulary = 2.2.0
-zope.configuration = 4.3.1
-zope.container = 4.2.2
-zope.contentprovider = 4.2.1
-zope.contenttype = 4.4
-zope.datetime = 4.2.0
-zope.deferredimport = 4.3.1
-zope.deprecation = 4.4.0
-zope.dottedname = 4.3
-zope.event = 4.4
-zope.exceptions = 4.3
-zope.filerepresentation = 4.2.0
-zope.formlib = 4.6.0
-zope.globalrequest = 1.5
-zope.hookable = 4.2.0
-zope.i18n = 4.7.0
-zope.i18nmessageid = 4.3.1
-zope.interface = 4.6.0
-zope.lifecycleevent = 4.3.0
-zope.location = 4.2
-zope.pagetemplate = 4.4.1
-zope.processlifetime = 2.3.0
-zope.proxy = 4.3.2
-zope.ptresource = 4.2.0
-zope.publisher = 5.1.1
-zope.ramcache = 2.3
-zope.schema = 4.9.3
-zope.security = 4.3.1
-zope.sendmail = 5.0
-zope.sequencesort = 4.1.2
-zope.site = 4.2.2
-zope.size = 4.3
-zope.structuredtext = 4.3
-zope.tal = 4.4
-zope.tales = 5.0.1
-zope.testbrowser = 5.3.3
-zope.testing = 4.7
-zope.testrunner = 5.0
-zope.traversing = 4.3.1
-zope.viewlet = 4.2.1

stack/erp5/versions.cfg

-[buildout]
-extends =
-    versions-prod.cfg
-versions = versions
-
-[versions]
-# Version pins for development and optional dependencies.
-Babel = 2.7.0
-Jinja2 = 2.10.1
-MarkupSafe = 1.1.1
-Pygments = 2.4.2
-# Version 2.0+ needs Python 3.x
-Sphinx = 1.8.5
-alabaster = 0.7.12
-appdirs = 1.4.3
-attrs = 19.1.0
-backports.functools-lru-cache = 1.5
-beautifulsoup4 = 4.8.0
-bleach = 3.1.0
-buildout.wheel = 0.2.0
-certifi = 2019.6.16
-cffi = 1.12.3
-chardet = 3.0.4
-cmarkgfm = 0.4.2
-collective.recipe.cmd = 0.11
-collective.recipe.sphinxbuilder = 1.1
-collective.recipe.template = 2.1
-colorama = 0.4.1
-configparser = 3.8.1
-contextlib2 = 0.5.5
-coverage = 4.5.4
-docutils = 0.15.2
-filelock = 3.0.12
-idna = 2.8
-imagesize = 1.1.0
-importlib-metadata = 0.20
-lxml = 4.4.1
-manuel = 1.10.1
-# Version 6+ needs Python 3.x
-more-itertools = 5.0.0
-mr.developer = 2.0.0
-nose = 1.3.7
-packaging = 19.1
-pathlib2 = 2.3.4
-pip = 19.2.3
-pkginfo = 1.5.0.1
-plone.recipe.command = 1.1
-pluggy = 0.12.0
-py = 1.8.0
-pycparser = 2.19
-pyparsing = 2.4.2
-python-gettext = 4.0
-readme-renderer = 24.0
-repoze.sphinx.autointerface = 0.8
-requests = 2.22.0
-requests-toolbelt = 0.9.1
-scandir = 1.10.0
-snowballstemmer = 1.9
-soupsieve = 1.9.3
-sphinx-rtd-theme = 0.4.3
-sphinxcontrib-websupport = 1.1.2
-toml = 0.10.0
-tox = 3.14.0
-tqdm = 4.35.0
-twine = 1.13.0
-typing = 3.7.4.1
-urllib3 = 1.25.3
-virtualenv = 16.7.5
-webencodings = 0.5.1
-wheel = 0.33.6
-z3c.checkversions = 1.1
-zc.recipe.egg = 2.0.7
-zc.recipe.testrunner = 2.1
-zest.releaser = 6.19.1
-zipp = 0.6.0
-zodbupdate = 1.4