build on zope4

stack/erp5/buildout.cfg

@@ -58,9 +58,10 @@ extends =
   ../../component/wendelin.core/buildout.cfg
   ../../component/jupyter-py2/buildout.cfg
   ../../stack/caucase/buildout.cfg
-  ../../software/neoppod/software-common.cfg
+  ../../software/neoppod/software-zodb5.cfg
 # keep neoppod extends last
 
+
 parts +=
   erp5-util-develop
   slapos-cookbook
@@ -86,6 +87,7 @@ parts +=
 # jupyter
   jupyter-notebook-initialized-scripts
 
+allow-picked-versions = true
 
 # override instance-jupyter-notebook not to render into default template.cfg
 [instance-jupyter-notebook]
@@ -334,8 +336,8 @@ wcfs-enable-default = false
 
 [erp5]
 recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/erp5.git
-branch = master
+repository = https://lab.nexedi.com/aurel/erp5.git
+branch = py2zope4
 git-executable = ${git:location}/bin/git
 
 [testrunner]
@@ -498,7 +500,7 @@ eggs = ${neoppod:eggs}
 # Zope
   Zope2
 # Zope acquisition patch
-  Acquisition
+#  Acquisition
 # for runzeo
   ${ZEO:egg}
 
@@ -506,13 +508,8 @@ eggs = ${neoppod:eggs}
   Products.PluggableAuthService
   Products.PluginRegistry
 
-# CMF 2.2
-  ${Products.CMFActionIcons:egg}
-  ${Products.CMFCalendar:egg}
+# CMF 2.3
   ${Products.CMFCore:egg}
-  ${Products.CMFDefault:egg}
-  ${Products.CMFTopic:egg}
-  ${Products.CMFUid:egg}
   ${Products.DCWorkflow:egg}
   ${Products.GenericSetup:egg}
   five.localsitemanager
@@ -555,6 +552,15 @@ eggs = ${neoppod:eggs}
   zope.globalrequest
   waitress
 
+# Used by zope4
+  docutils
+  zLOG
+  Products.ZSQLMethods
+  ZServer
+  Products.ExternalMethod
+  Products.SiteErrorLog
+  tempstorage
+  
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the
 # installation of python, which we don't want on an instance
@@ -570,7 +576,6 @@ scripts =
   tidstoraged
   tidstorage_repozo
   wcfs
-  web_checker_utility
 
 extra-paths =
   ${erp5:location}
@@ -579,11 +584,16 @@ extra-paths =
 patch-binary = ${patch:location}/bin/patch
 PyPDF2-patches = ${:_profile_base_location_}/../../component/egg-patch/PyPDF2/0001-Custom-implementation-of-warnings.formatwarning-remo.patch#d25bb0f5dde7f3337a0a50c2f986f5c8
 PyPDF2-patch-options = -p1
-Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#1d9a56e9af4371f5b6951ebf217a15d7
+Acquisition-patches = 
+#  ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#1d9a56e9af4371f5b6951ebf217a15d7
 Acquisition-patch-options = -p1
 python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
 python-magic-patch-options = -p1
 
+[template-neo]
+recipe = 
+template =
+
 [eggs-all-scripts]
 recipe = zc.recipe.egg
 eggs =
@@ -616,7 +626,7 @@ depends =
 #  neoppod, mysqlclient, slapos.recipe.template
 
 # patched eggs
-Acquisition = 2.13.12+SlapOSPatched001
+#Acquisition = 2.13.12+SlapOSPatched001
 Products.DCWorkflow = 2.2.4+SlapOSPatched001
 ocropy = 1.0+SlapOSPatched001
 pysvn = 1.7.10+SlapOSPatched002
@@ -635,11 +645,7 @@ zope.dottedname = 4.1.0
 SOAPpy = 0.12.0nxd001
 
 # CMF 2.3 is not yet supported.
-Products.CMFCalendar = 2.2.3
-Products.CMFCore = 2.2.10
-Products.CMFDefault = 2.2.4
-Products.CMFTopic = 2.2.1
-Products.CMFUid = 2.2.1
+#Products.CMFCore = 2.2.10
 
 # newer version requires zope.traversing>=4.0.0a2.
 zope.app.appsetup = 3.16.0
@@ -657,7 +663,7 @@ Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
 # Products.ExternalEditor 2.0.0's dtml is not based on Zope2 OFS's one.
 Products.ExternalEditor = 1.1.1
-Products.GenericSetup = 1.8.6
+#Products.GenericSetup = 1.8.6
 Products.LongRequestLogger = 2.1.0
 # Products.MimetypesRegistry 2.1 requires AccessControl>=3.0.0Acquisition.
 Products.MimetypesRegistry = 2.0.10
@@ -803,3 +809,9 @@ WebOb = 1.8.5
 soupsieve = 1.9.5
 
 eggtestinfo = 0.3
+
+# AUREL
+zope.interface = 5.2.0 
+ZConfig = 3.5.0
+Products.CMFCore = 2.4.0
+#Products.GenericSetup = 1.8.6
\ No newline at end of file

stack/erp5/buildout.hash.cfg

@@ -34,11 +34,11 @@ md5sum = fed6dd2bdc389b4fc7e7b7ca32c5d4b6
 
 [template-zope-conf]
 filename = zope.conf.in
-md5sum = 5ce9d5e99880d5db9ed339bbefe28d34
+md5sum = a833cfe556c9cbf68ac3ab0af7b95397
 
 [site-zcml]
 filename = site.zcml
-md5sum = d32417746fcf671d4e86a70379815039
+md5sum = 43556e5bca8336dd543ae8068512aa6d
 
 [template-my-cnf]
 filename = my.cnf.in

stack/erp5/site.zcml

@@ -21,6 +21,6 @@
 
 
   <securityPolicy
-      component="Products.Five.security.FiveSecurityPolicy" />
+      component="AccessControl.security.SecurityPolicy" />
 
 </configure>

stack/erp5/zope-versions.cfg

+[buildout]
+# Version pins for required and commonly used dependencies.
+
 [versions]
-Zope2 = 2.13.30
-AccessControl = 2.13.16
-Acquisition = 2.13.12
-DateTime = 2.12.8
-DocumentTemplate = 2.13.6
-ExtensionClass = 2.13.2
-MarkupSafe = 1.1.1
-Missing = 2.13.1
-MultiMapping = 2.13.0
-Paste = 1.7.5.1
-PasteDeploy = 1.3.4
-PasteScript = 1.7.5
-Persistence = 2.13.2
-Products.BTreeFolder2 = 2.13.5
-Products.ExternalMethod = 2.13.1
-Products.MIMETools = 2.13.0
-Products.MailHost = 2.13.4
-Products.OFSP = 2.13.2
-Products.PythonScripts = 2.13.2
-Products.Sessions = 3.0
-Products.StandardCacheManagers = 2.13.1
-Products.TemporaryFolder = 3.0
-Products.ZCTextIndex = 2.13.5
-Products.ZCatalog = 2.13.30
-Record = 2.13.0
-RestrictedPython = 3.6.0
-Sphinx = 1.0.8
-ZConfig = 2.9.3
-ZODB3 = 3.10.7
-ZServer = 3.0
-ZopeUndo = 2.12.0
-appdirs = 1.4.3
-configparser = 4.0.2
-contextlib2 = 0.6.0.post1
-distlib = 0.3.0
-docutils = 0.12
-filelock = 3.0.12
-importlib-metadata = 1.3.0
-importlib-resources = 1.0.2
-initgroups = 2.13.0
-mechanize = 0.2.5
-more-itertools = 5.0.0
-mr.developer = 1.34
-packaging = 20.1
-pathlib2 = 2.3.5
-pluggy = 0.13.1
-py = 1.8.1
-pyparsing = 2.4.6
-pytz = 2017.2
-repoze.retry = 1.2
-repoze.tm2 = 1.0
-repoze.who = 2.0
-scandir = 1.10.0
-six = 1.14.0
-tempstorage = 2.12.2
-toml = 0.10.0
-tox = 3.14.4
-transaction = 1.1.1
-typing = 3.7.4.1
-virtualenv = 20.0.4
-z3c.checkversions = 1.1
-zExceptions = 2.13.0
-zLOG = 2.11.2
-zc.buildout = 2.3.1
-zc.lockfile = 1.0.2
-zc.recipe.egg = 2.0.5
-zc.recipe.testrunner = 1.2.1
-zdaemon = 2.0.7
-zipp = 0.6.0
-zope.annotation = 3.5.0
-zope.broken = 3.6.0
-zope.browser = 1.3
-zope.browsermenu = 3.9.1
-zope.browserpage = 3.12.2
-zope.browserresource = 3.10.3
-zope.component = 3.9.5
-zope.configuration = 3.7.4
-zope.container = 3.11.2
-zope.contentprovider = 3.7.2
-zope.contenttype = 3.5.5
-zope.deferredimport = 3.5.3
-zope.dottedname = 3.4.6
-zope.event = 3.5.2
-zope.exceptions = 3.6.2
-zope.filerepresentation = 3.6.1
-zope.i18n = 3.7.4
-zope.i18nmessageid = 3.5.3
-zope.interface = 3.6.8
-zope.lifecycleevent = 3.6.2
-zope.location = 3.9.1
-zope.pagetemplate = 3.5.2
-zope.processlifetime = 1.0
-zope.proxy = 3.6.1
-zope.ptresource = 3.9.0
-zope.publisher = 3.12.6
-zope.schema = 3.7.1
-zope.security = 3.7.4
-zope.sendmail = 3.7.5
-zope.sequencesort = 3.4.0
-zope.site = 3.9.2
-zope.size = 3.4.1
-zope.structuredtext = 3.5.1
-zope.tal = 3.5.2
-zope.tales = 3.5.3
-zope.testbrowser = 3.11.1
-zope.testing = 3.9.7
-zope.traversing = 3.13.2
-zope.viewlet = 3.7.2
+Zope = 4.5.3
+Zope2 = 4.0
+# AccessControl 5+ no longer supports Zope 4.
+AccessControl = 4.2
+Acquisition = 4.7
+AuthEncoding = 4.2
+BTrees = 4.7.2
+Chameleon = 3.8.1
+DateTime = 4.3
+# DocumentTemplate 4+ no longer supports Zope 4.
+DocumentTemplate = 3.4
+ExtensionClass = 4.5.0
+Missing = 4.1
+MultiMapping = 4.1
+Paste = 3.5.0
+PasteDeploy = 2.1.1
+Persistence = 3.0
+Products.BTreeFolder2 = 4.2
+# ZCatalog 6+ no longer supports Zope 4.
+Products.ZCatalog = 5.2
+Record = 3.5
+RestrictedPython = 5.1
+WSGIProxy2 = 0.4.6
+WebOb = 1.8.6
+WebTest = 2.0.35
+ZConfig = 3.5.0
+ZEO = 5.2.2
+ZODB = 5.6.0
+ZServer = 4.0.2
+five.globalrequest = 99.1
+five.localsitemanager = 3.2.2
+funcsigs = 1.0.2
+future = 0.18.2
+ipaddress = 1.0.23
+# mock 4.0 and up requires Python 3
+mock = 3.0.5
+pbr = 5.5.1
+persistent = 4.6.4
+pytz = 2020.4
+roman = 3.3
+shutilwhich = 1.1.0
+six = 1.15.0
+transaction = 3.0.0
+waitress = 1.4.4
+z3c.pt = 3.3.0
+zExceptions = 4.1
+zc.lockfile = 2.0
+zdaemon = 4.3
+zodbpickle = 2.0.0
+zope.annotation = 4.7.0
+zope.browser = 2.3
+zope.browsermenu = 4.4
+zope.browserpage = 4.4.0
+zope.browserresource = 4.4
+zope.cachedescriptors = 4.3.1
+zope.component = 4.6.2
+zope.componentvocabulary = 2.2.0
+zope.configuration = 4.4.0
+zope.container = 4.4.0
+zope.contentprovider = 4.2.1
+zope.contenttype = 4.5.0
+zope.datetime = 4.2.0
+zope.deferredimport = 4.3.1
+zope.deprecation = 4.4.0
+zope.dottedname = 4.3
+zope.event = 4.5.0
+zope.exceptions = 4.4
+zope.filerepresentation = 5.0.0
+zope.formlib = 4.7.1
+zope.globalrequest = 1.5
+zope.hookable = 5.0.1
+zope.i18n = 4.7.0
+zope.i18nmessageid = 5.0.1
+zope.interface = 5.2.0
+zope.lifecycleevent = 4.3.0
+zope.location = 4.2
+zope.pagetemplate = 4.5.0
+zope.processlifetime = 2.3.0
+zope.proxy = 4.3.5
+zope.ptresource = 4.2.0
+zope.publisher = 5.2.1
+zope.ramcache = 2.3
+zope.schema = 6.0.0
+zope.security = 5.1.1
+zope.sendmail = 5.1
+zope.sequencesort = 4.1.2
+zope.site = 4.4.0
+zope.size = 4.3
+zope.structuredtext = 4.3
+zope.tal = 4.4
+zope.tales = 5.1
+zope.testbrowser = 5.5.1
+# Version 4.8+ dropped support for Python 3.5
+zope.testing = 4.7
+zope.testrunner = 5.2
+zope.traversing = 4.4.1
+zope.viewlet = 4.2.1

stack/erp5/zope.conf.in

@@ -5,7 +5,7 @@
 # too late for some components.
 %define INSTANCE {{ parameter_dict['instance'] }}
 instancehome $INSTANCE
-zserver-threads {{ parameter_dict['thread-amount'] }}
+# zserver-threads {{ parameter_dict['thread-amount'] }}
 # When ownership checking is enabled, the roles a script runs as are the
 # intersection between user's roles and script owner's roles. This means
 # that revoking a code author's access to the system prevent all scripts
@@ -15,15 +15,15 @@ zserver-threads {{ parameter_dict['thread-amount'] }}
 # revoked when their account is terminated.
 skip-ownership-checking true
 
-lock-filename {{ parameter_dict['lock-file'] }}
+# lock-filename {{ parameter_dict['lock-file'] }}
 pid-filename {{ parameter_dict['pid-file'] }}
 
 default-zpublisher-encoding utf-8
-rest-input-encoding utf-8
-rest-output-encoding utf-8
+# rest-input-encoding utf-8
+# rest-output-encoding utf-8
 
 # XXX: isn't this entry implicit ?
-products {{ parameter_dict['instance-products'] }}
+# products {{ parameter_dict['instance-products'] }}
 
 # Magic parameter to use the first entry of X-Forwarded-For as the source IP address.
 # (see monkey patches in ERP5Type/patches/HTTPRequest.py and ERP5Type/patches/http_server.py)
@@ -45,9 +45,6 @@ trusted-proxy 0.0.0.0
 {%   endif %}
 {%- endif %}
 
-<zoperunner>
-    program $INSTANCE/bin/runzope
-</zoperunner>
 
 <product-config DeadlockDebugger>
   dump_url {{ parameter_dict['deadlock-path'] }}
@@ -63,10 +60,6 @@ trusted-proxy 0.0.0.0
 
 {% endif -%}
 
-{% if 'large-file-threshold' in parameter_dict -%}
-large-file-threshold {{ parameter_dict['large-file-threshold'] }}
-
-{% endif -%}
 {% if 'tidstorage-ip' in parameter_dict -%}
 <product-config TIDStorage>
   backend-ip {{ parameter_dict['tidstorage-ip'] }}
@@ -78,18 +71,6 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
   node-id {{ node_id }}
 </product-config>
 
-{% set timerserver_interval = parameter_dict['timerserver-interval'] -%}
-{% if timerserver_interval -%}
-{%   if parameter_dict['wsgi'] -%}
-%import Products.TimerService.timerserver
-{%   else %}
-%import timerserver
-{%   endif -%}
-<timer-server>
-  interval {{ timerserver_interval }}
-</timer-server>
-
-{% endif -%}
 {% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
 {% if sql_connection_string -%}
 {%   set bt5_repository_url = [] -%}
@@ -114,22 +95,6 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
 </product-config>
 
 {% endif -%}
-<eventlog>
-  level info
-  <logfile>
-    dateformat
-    path {{ parameter_dict['event-log'] }}
-  </logfile>
-</eventlog>
-
-<logger access>
-  level WARN
-  <logfile>
-    dateformat
-    format %(message)s
-    path {{ parameter_dict['z2-log'] }}
-  </logfile>
-</logger>
 
 <zodb_db temporary>
   <temporarystorage>

stack/erp5/ztk-versions.cfg

-[versions]
-# ZTK
-zope.annotation = 3.5.0
-zope.applicationcontrol = 3.5.5
-zope.authentication = 3.7.1
-zope.broken = 3.6.0
-zope.browser = 1.3
-zope.browsermenu = 3.9.1
-zope.browserpage = 3.12.2
-zope.browserresource = 3.10.3
-zope.cachedescriptors = 3.5.1
-zope.catalog = 3.8.2
-zope.component = 3.9.5
-zope.componentvocabulary = 1.0.1
-zope.configuration = 3.7.4
-zope.container = 3.11.2
-zope.contentprovider = 3.7.2
-zope.contenttype = 3.5.5
-zope.copy = 3.5.0
-zope.copypastemove = 3.7.0
-zope.datetime = 3.4.1
-zope.deferredimport = 3.5.3
-zope.deprecation = 3.4.1
-zope.dottedname = 3.4.6
-zope.dublincore = 3.7.1
-zope.error = 3.7.4
-zope.event = 3.5.2
-zope.exceptions = 3.6.2
-zope.filerepresentation = 3.6.1
-zope.formlib = 4.0.6
-zope.hookable = 3.4.1
-zope.i18n = 3.7.4
-zope.i18nmessageid = 3.5.3
-zope.index = 3.6.4
-zope.interface = 3.6.7
-zope.intid = 3.7.2
-zope.keyreference = 3.6.4
-zope.lifecycleevent = 3.6.2
-zope.location = 3.9.1
-zope.login = 1.0.0
-zope.mimetype = 1.3.1
-zope.minmax = 1.1.2
-zope.pagetemplate = 3.5.2
-zope.password = 3.6.1
-zope.pluggableauth = 1.0.3
-zope.principalannotation = 3.6.1
-zope.principalregistry = 3.7.1
-zope.processlifetime = 1.0
-zope.proxy = 3.6.1
-zope.ptresource = 3.9.0
-zope.publisher = 3.12.6
-zope.ramcache = 1.0
-zope.schema = 3.7.1
-zope.security = 3.7.4
-zope.securitypolicy = 3.7.0
-zope.sendmail = 3.7.5
-zope.sequencesort = 3.4.0
-zope.server = 3.6.3
-zope.session = 3.9.5
-zope.site = 3.9.2
-zope.size = 3.4.1
-zope.structuredtext = 3.5.1
-zope.tal = 3.5.2
-zope.tales = 3.5.3
-zope.testing = 3.9.7
-zope.traversing = 3.13.2
-zope.viewlet = 3.7.2
-
-# Deprecating
-zope.documenttemplate = 3.4.3
+[buildout]
+extends =
+    zope-versions.cfg
+versions = versions
 
-# Dependencies
-# Needed for the mechanize 0.1.x.
-ClientForm = 0.2.10
-distribute = 0.6.49
-docutils = 0.7
-# Newer versions of mechanize are not fully py24 compatible.
-mechanize = 0.1.11
-Paste = 1.7.5.1
-PasteDeploy = 1.3.4
-PasteScript = 1.7.5
-py = 1.3.4
-Pygments = 1.3.1
-python-gettext = 1.0
-pytz = 2013b
-RestrictedPython = 3.6.0
-setuptools = 12.2
-Sphinx = 1.0.8
-transaction = 1.1.1
-unittest2 = 0.5.1
-z3c.recipe.sphinxdoc = 0.0.8
-zc.buildout = 2.3.1
-zc.lockfile = 1.0.2
-ZConfig = 2.8.0
-zc.recipe.egg = 1.3.2
-zc.recipe.testrunner = 1.2.1
-zc.resourcelibrary = 1.3.4
-zdaemon = 2.0.7
-ZODB3 = 3.9.7
-zope.mkzeoinstance = 3.9.6
-
-# toolchain
-argparse = 1.1
-coverage = 3.5.3
-lxml = 2.2.8
-mr.developer = 1.25
-tl.eggdeps = 0.4
-nose = 1.1.2
-z3c.checkversions = 0.4.2
-z3c.recipe.compattest = 0.12.2
-z3c.recipe.depgraph = 0.5
-zope.kgs = 1.2.0
+[versions]
+# Version pins for development and optional dependencies.
+Babel = 2.8.1
+Jinja2 = 2.11.2
+MarkupSafe = 1.1.1
+# Pygments 2.6.0 and up require Python 3
+Pygments = 2.5.2
+# Version 2.0+ needs Python 3.x
+Sphinx = 1.8.5
+alabaster = 0.7.12
+appdirs = 1.4.4
+attrs = 20.3.0
+backports.functools-lru-cache = 1.6.1
+beautifulsoup4 = 4.9.3
+bleach = 3.2.1
+buildout.wheel = 0.2.0
+# Version 2020.4.5.2 and up claim no Python 2 support
+certifi = 2020.4.5.1
+cffi = 1.14.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.4
+# configparser 5 and up require Python 3
+configparser = 4.0.2
+contextlib2 = 0.6.0.post1
+coverage = 5.3
+distlib = 0.3.1
+docutils = 0.16
+filelock = 3.0.12
+idna = 2.10
+imagesize = 1.2.0
+# tox and pluggy require importlib-metadata <1
+importlib-metadata = 0.23
+lxml = 4.6.1
+manuel = 1.10.1
+# Version 6+ needs Python 3.x
+more-itertools = 5.0.0
+mr.developer = 2.0.1
+nose = 1.3.7
+packaging = 20.4
+pathlib2 = 2.3.5
+pip = 20.2.4
+pkginfo = 1.6.1
+plone.recipe.command = 1.1
+pluggy = 0.13.1
+py = 1.9.0
+pycparser = 2.20
+pyparsing = 2.4.7
+python-gettext = 4.0
+readme-renderer = 28.0
+repoze.sphinx.autointerface = 0.8
+requests = 2.25.0
+requests-toolbelt = 0.9.1
+scandir = 1.10.0
+snowballstemmer = 2.0.0
+# soupsieve 2 needs Python 3
+soupsieve = 1.9.6
+sphinx-rtd-theme = 0.5.0
+sphinxcontrib-serializinghtml = 1.1.4
+sphinxcontrib-websupport = 1.2.4
+# tempstorage is only needed because the Sphinx documentation parses
+# ZConfig xml configurations, which still contain references to it
+tempstorage = 5.1
+toml = 0.10.2
+tox = 3.20.1
+tqdm = 4.51.0
+# Version 2+ needs Python 3.x
+twine = 1.15.0
+typing = 3.7.4.3
+urllib3 = 1.26.1
+virtualenv = 20.1.0
+webencodings = 0.5.1
+wheel = 0.35.1
+z3c.checkversions = 1.2
+zc.recipe.egg = 2.0.7
+zc.recipe.testrunner = 2.1
+zest.releaser = 6.22.1
+# Version 2 requires Python 3
+zipp = 1.1.1
+zodbupdate = 1.5