Commit 8fec0f04 authored by Carlos Ramos Carreño's avatar Carlos Ramos Carreño

Update to buildout 3 for erp5-zope2.

The SR of erp5-zope2 had the version of zc.buildout pinned to an
unpatched version that did not support build dependencies (
"setup-eggs").
This caused problems when trying to compile erp5-zope2 with recent
SlapOS in the test nodes, as it tries to use "setup_requires" instead,
which is not allowed:

```
Getting distribution for 'wstools'.
DEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer maintained. pip 21.0 will drop support for Python 2.7 in January 2021. More details about Python 2 support in pip can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support pip 21.0 will remove support for this functionality.
    ERROR: Command errored out with exit status 1:
     command: /srv/slapgrid/slappart19/t/eoa/shared/python2.7/3be205495452cf4067d1b6b952432c55/bin/python2.7 -c 'import sys, setuptools, tokenize; sys.argv[0] = '"'"'/tmp/pip-req-build-V_C9uf/setup.py'"'"'; __file__='"'"'/tmp/pip-req-build-V_C9uf/setup.py'"'"';f=getattr(tokenize, '"'"'open'"'"', open)(__file__);code=f.read().replace('"'"'\r\n'"'"', '"'"'\n'"'"');f.close();exec(compile(code, __file__, '"'"'exec'"'"'))' egg_info --egg-base /tmp/pip-pip-egg-info-2KP9FV
         cwd: /tmp/pip-req-build-V_C9uf/
    Complete output (25 lines):
    DEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer maintained. pip 21.0 will drop support for Python 2.7 in January 2021. More details about Python 2 support in pip can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support pip 21.0 will remove support for this functionality.
    WARNING: Url 'file:///dev/null/pytest-runner/' is ignored: it is neither a file nor a directory.
    ERROR: Could not find a version that satisfies the requirement pytest-runner (from versions: none)
    ERROR: No matching distribution found for pytest-runner
```

We remove these pins to use the latter version of buildout from
slapos.cfg.

In addition we adapt the erp5-zope2 buildout.cfg to buildout 3,
following the same steps as in 8c45efb1.
parent b642d9da
...@@ -526,8 +526,17 @@ Products.DCWorkflow-patch-options = -p1 ...@@ -526,8 +526,17 @@ Products.DCWorkflow-patch-options = -p1
[Products.GenericSetup] [Products.GenericSetup]
<= zope-product-with-eggtestinfo <= zope-product-with-eggtestinfo
[wstools]
# a SOAPpy dependency
recipe = zc.recipe.egg:custom
egg = wstools
setup-eggs =
pbr
pytest-runner
[eggs] [eggs]
<= neoppod <= neoppod
depends = ${wstools:recipe}
eggs = ${neoppod:eggs} eggs = ${neoppod:eggs}
${caucase-eggs:eggs} ${caucase-eggs:eggs}
${wendelin.core:egg} ${wendelin.core:egg}
...@@ -777,6 +786,7 @@ pyPdf = 1.13 ...@@ -777,6 +786,7 @@ pyPdf = 1.13
PyStemmer = 1.3.0 PyStemmer = 1.3.0
StructuredText = 2.11.1 StructuredText = 2.11.1
WSGIUtils = 0.7 WSGIUtils = 0.7
wstools = 0.4.8
erp5-coverage-plugin = 0.0.1 erp5-coverage-plugin = 0.0.1
erp5diff = 0.8.1.8 erp5diff = 0.8.1.8
five.formlib = 1.0.4 five.formlib = 1.0.4
......
...@@ -63,7 +63,6 @@ virtualenv = 20.0.4 ...@@ -63,7 +63,6 @@ virtualenv = 20.0.4
z3c.checkversions = 1.1 z3c.checkversions = 1.1
zExceptions = 2.13.0 zExceptions = 2.13.0
zLOG = 2.11.2 zLOG = 2.11.2
zc.buildout = 2.3.1
zc.lockfile = 1.0.2 zc.lockfile = 1.0.2
zc.recipe.egg = 2.0.5 zc.recipe.egg = 2.0.5
zc.recipe.testrunner = 1.2.1 zc.recipe.testrunner = 1.2.1
......
...@@ -90,7 +90,6 @@ Sphinx = 1.0.8 ...@@ -90,7 +90,6 @@ Sphinx = 1.0.8
transaction = 1.1.1 transaction = 1.1.1
unittest2 = 0.5.1 unittest2 = 0.5.1
z3c.recipe.sphinxdoc = 0.0.8 z3c.recipe.sphinxdoc = 0.0.8
zc.buildout = 2.3.1
zc.lockfile = 1.0.2 zc.lockfile = 1.0.2
ZConfig = 2.8.0 ZConfig = 2.8.0
zc.recipe.egg = 1.3.2 zc.recipe.egg = 1.3.2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment