fixup! Merge remote-tracking branch 'origin/zope4py2' into zope4py3

component/pylint/buildout.cfg

@@ -12,6 +12,25 @@ patches =
   ${:_profile_base_location_}/astroid-six_moves_import_error.patch#377beb0c50f52b9608bb6be7bf93096e
 patch-options = -p1
 patch-binary = ${patch:location}/bin/patch
+setup-eggs = ${lazy-object-proxy:egg}
+
+[lazy-object-proxy]
+recipe = zc.recipe.egg:custom
+egg = lazy-object-proxy
+setup-eggs =
+  ${setuptools-scm:egg}
+  typing-extensions
+  tomli
+
+[setuptools-scm]
+recipe = zc.recipe.egg:custom
+egg = setuptools-scm
+setup-eggs = packaging
+
+[mccabe]
+recipe = zc.recipe.egg:custom
+egg = mccabe
+setup-eggs = pytest-runner
 
 [pylint]
 recipe = zc.recipe.egg:custom

stack/erp5/buildout-py3.cfg

@@ -146,8 +146,13 @@ eggs -=
   jupyterlab-launcher
   pytesseract
 
+[astroid]
+patches =
+
 [pylint]
 patches=
+setup-eggs = ${mccabe:egg}
+
 
 [versions]
 # zc.recipe.egg 2.0.7 (in versions.cfg) requires zc.buildout>=2.12.0, so let's
@@ -180,6 +185,11 @@ python-ldap = 3.1.0
 ipython = 7.31.1
 cryptography = 3.2.1
 mccabe = 0.6
+setuptools-scm = 7.0.5
+packaging = 20.4
+typing-extensions = 4.3.0:whl
+tomli = 2.0.1:whl
+lazy-object-proxy = 1.4.3
 isort = 4.2.5
 astroid = 2.4.0
 wrapt = 1.11

stack/erp5/buildout.cfg

@@ -687,7 +687,7 @@ pysvn = 1.9.15+SlapOSPatched001
 python-ldap = 2.4.32+SlapOSPatched001
 python-magic = 0.4.12+SlapOSPatched001
 PyPDF2 = 1.26.0+SlapOSPatched001
-Zope = 4.5.3+SlapOSPatched001
+Zope = 4.5.3+SlapOSPatched002
 ## https://lab.nexedi.com/nexedi/slapos/merge_requests/648
 pylint = 2.6.0
 # astroid 1.4.1 breaks testDynamicClassGeneration