fixup! fixup! ERP5 py3: WIP ( all changes squashed )

component/pylint/buildout.cfg

@@ -51,7 +51,6 @@ patches =
 
 [mccabe:python3]
 recipe = zc.recipe.egg
-patches =
 setup-eggs =
 
 [astroid:python3]

software/erp5/test/test/__init__.py

@@ -51,7 +51,9 @@ ERP5PY3 = os.environ['SLAPOS_SR_TEST_NAME'] == 'erp5-py3'
 _setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
         os.path.join(os.path.dirname(__file__), '..', '..', 'software%s.cfg' % (
-          '-py3' if ERP5PY3 else ''))))
+          '-py3' if ERP5PY3 else ''))),
+    software_id=os.environ['SLAPOS_SR_TEST_NAME'],
+)
 
 
 setup_module_executed = False

stack/erp5/buildout.cfg

@@ -791,10 +791,6 @@ Products.DCWorkflow = 2.4.1+SlapOSPatched001
 PyPDF2 = 1.26.0+SlapOSPatched002
 pysvn = 1.9.15+SlapOSPatched001
 python-magic = 0.4.12+SlapOSPatched001
-## https://lab.nexedi.com/nexedi/slapos/merge_requests/648
-pylint = 1.4.4+SlapOSPatched002
-# astroid 1.4.1 breaks testDynamicClassGeneration
-astroid = 1.3.8+SlapOSPatched001
 Zope = 5.9+SlapOSPatched003
 
 
@@ -944,6 +940,7 @@ python-dotenv = 1.0.1
 AccessControl = 4.4
 Acquisition = 4.13
 APacheDEX = 1.8
+astroid = 1.3.8+SlapOSPatched001
 AuthEncoding = 4.3
 Chameleon = 3.9.1
 DateTime = 4.9
@@ -959,8 +956,10 @@ Missing = 4.2
 mock = 4.0.3
 MultiMapping = 4.1
 multipart = 0.1.1
+networkx = 2.1
 numpy = 1.13.1
 ocropy = 1.0+SlapOSPatched001
+oic = 0.15.1
 openpyxl = 2.4.8
 parso = 0.5.1
 Paste = 3.5.2
@@ -968,6 +967,7 @@ PasteDeploy = 2.1.1
 pbr = 5.11.0
 Persistence = 3.6
 persistent = 4.9.3
+Pillow = 6.2.2
 Products.BTreeFolder2 = 4.4
 Products.ExternalMethod = 4.7
 Products.GenericSetup = 2.3.0
@@ -984,11 +984,14 @@ Products.ZCatalog = 5.4
 Products.ZODBMountPoint = 1.3
 Products.ZSQLMethods = 3.16
 prompt-toolkit = 1.0.13
+pyasn1-modules = 0.0.8
+pylint = 1.4.4+SlapOSPatched002
 Pympler = 0.4.3
 PyStemmer = 1.3.0
 python-ldap = 2.4.32+SlapOSPatched001
 pytracemalloc = 1.2
 pytz = 2022.7
+PyWavelets = 0.5.2
 Record = 3.6
 RestrictedPython = 5.4+SlapOSPatched001
 roman = 3.3
@@ -1056,8 +1059,3 @@ zope.testrunner = 5.6
 zope.traversing = 4.4.1
 zope.viewlet = 4.3
 ZServer = 4.0.2
-PyWavelets = 0.5.2
-networkx = 2.1
-pyasn1-modules = 0.0.8
-Pillow = 6.2.2
-oic = 0.15.1