Commit 19c873f2 authored by Jérome Perrin's avatar Jérome Perrin

*: fix missing setup_requires

buildout has no knowledge of setup_requires, when installing a package with
setup_requires, setuptools will fetch the package from pypi and install its latest
version, regardless of buildout's versions or allow-picked-versions options, that
are critical for us to ensure repeatability.

These patches were produced by running buildout with a modified setuptools version which does not install setup_requires ( jerome/setuptools@54f42c38 ) and by modifying the profiles to use setup-eggs option in all the sections installing packages using setup_requires.

See merge request nexedi/slapos!912
parents 104516a7 847811b6
[buildout] [buildout]
extends = extends =
../libffi/buildout.cfg ../libffi/buildout.cfg
../python-cffi/buildout.cfg
parts = parts =
bcrypt bcrypt
...@@ -16,3 +17,5 @@ egg = bcrypt ...@@ -16,3 +17,5 @@ egg = bcrypt
rpath = rpath =
${libffi:location}/lib/ ${libffi:location}/lib/
environment = bcrypt-env environment = bcrypt-env
setup-eggs =
${python-cffi:egg}
...@@ -17,6 +17,8 @@ egg = h5py ...@@ -17,6 +17,8 @@ egg = h5py
setup-eggs = setup-eggs =
${cython:egg} ${cython:egg}
${numpy:egg} ${numpy:egg}
pkgconfig
six
include-dirs = include-dirs =
${hdf5:location}/include ${hdf5:location}/include
library-dirs = library-dirs =
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../libffi/buildout.cfg ../libffi/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../python-cffi/buildout.cfg
parts = parts =
python-pynacl python-pynacl
...@@ -14,6 +15,8 @@ library-dirs = ...@@ -14,6 +15,8 @@ library-dirs =
${libffi:location}/lib/ ${libffi:location}/lib/
rpath = rpath =
${libffi:location}/lib/ ${libffi:location}/lib/
setup-eggs =
${python-cffi:egg}
[python-pynacl-env] [python-pynacl-env]
PATH = ${pkgconfig:location}/bin:%(PATH)s PATH = ${pkgconfig:location}/bin:%(PATH)s
......
[buildout] [buildout]
extends = extends =
../pandas/buildout.cfg ../pandas/buildout.cfg
../scipy/buildout.cfg
parts = parts =
statsmodels statsmodels
...@@ -14,3 +15,4 @@ egg = statsmodels ...@@ -14,3 +15,4 @@ egg = statsmodels
environment = statsmodels-env environment = statsmodels-env
setup-eggs = setup-eggs =
${pandas:egg} ${pandas:egg}
${scipy:egg}
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../../component/bcrypt/buildout.cfg ../../component/bcrypt/buildout.cfg
../../component/python-cliff/buildout.cfg
../../component/curl/buildout.cfg ../../component/curl/buildout.cfg
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
...@@ -185,6 +186,7 @@ setup = ${slapos.core-repository:location} ...@@ -185,6 +186,7 @@ setup = ${slapos.core-repository:location}
[python-interpreter] [python-interpreter]
eggs += ${:extra-eggs} eggs += ${:extra-eggs}
extra-eggs = extra-eggs =
${python-cliff:egg}
${lxml-python:egg} ${lxml-python:egg}
${slapos.core-setup:egg} ${slapos.core-setup:egg}
${pillow-python:egg} ${pillow-python:egg}
......
...@@ -378,6 +378,31 @@ initialization = ...@@ -378,6 +378,31 @@ initialization =
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split())) repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list] sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
[zope-product-with-eggtestinfo]
recipe = zc.recipe.egg:custom
setup-eggs =
eggtestinfo
egg = ${:_buildout_section_name_}
[Products.CMFUid]
<= zope-product-with-eggtestinfo
[Products.CMFActionIcons]
<= zope-product-with-eggtestinfo
[Products.CMFCalendar]
<= zope-product-with-eggtestinfo
[Products.CMFCore]
<= zope-product-with-eggtestinfo
[Products.CMFDefault]
<= zope-product-with-eggtestinfo
[Products.CMFTopic]
<= zope-product-with-eggtestinfo
[Products.DCWorkflow]
<= zope-product-with-eggtestinfo
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#975b49e96bae33ac8563454fe5fa9899
Products.DCWorkflow-patch-options = -p1
[Products.GenericSetup]
<= zope-product-with-eggtestinfo
[eggs] [eggs]
<= neoppod <= neoppod
eggs = ${neoppod:eggs} eggs = ${neoppod:eggs}
...@@ -472,14 +497,14 @@ eggs = ${neoppod:eggs} ...@@ -472,14 +497,14 @@ eggs = ${neoppod:eggs}
Products.PluginRegistry Products.PluginRegistry
# CMF 2.2 # CMF 2.2
Products.CMFActionIcons ${Products.CMFActionIcons:egg}
Products.CMFCalendar ${Products.CMFCalendar:egg}
Products.CMFCore ${Products.CMFCore:egg}
Products.CMFDefault ${Products.CMFDefault:egg}
Products.CMFTopic ${Products.CMFTopic:egg}
Products.CMFUid ${Products.CMFUid:egg}
Products.DCWorkflow ${Products.DCWorkflow:egg}
Products.GenericSetup ${Products.GenericSetup:egg}
five.localsitemanager five.localsitemanager
# Other products # Other products
...@@ -545,8 +570,6 @@ PyPDF2-patches = ${:_profile_base_location_}/../../component/egg-patch/PyPDF2/00 ...@@ -545,8 +570,6 @@ PyPDF2-patches = ${:_profile_base_location_}/../../component/egg-patch/PyPDF2/00
PyPDF2-patch-options = -p1 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 Acquisition-patch-options = -p1
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#975b49e96bae33ac8563454fe5fa9899
Products.DCWorkflow-patch-options = -p1
python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068 python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
python-magic-patch-options = -p1 python-magic-patch-options = -p1
...@@ -773,3 +796,5 @@ beautifulsoup4 = 4.8.2 ...@@ -773,3 +796,5 @@ beautifulsoup4 = 4.8.2
# WSGIProxy2==0.4.6 # WSGIProxy2==0.4.6
WebOb = 1.8.5 WebOb = 1.8.5
soupsieve = 1.9.5 soupsieve = 1.9.5
eggtestinfo = 0.3
...@@ -121,6 +121,7 @@ depends = ${slapos-toolbox-dependencies:eggs} ...@@ -121,6 +121,7 @@ depends = ${slapos-toolbox-dependencies:eggs}
# slapos.toolbox dependencies. # slapos.toolbox dependencies.
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${python-cliff:egg}
${lxml-python:egg} ${lxml-python:egg}
${pycurl:egg} ${pycurl:egg}
${python-cryptography:egg} ${python-cryptography:egg}
...@@ -135,6 +136,7 @@ setup-eggs = setuptools_scm ...@@ -135,6 +136,7 @@ setup-eggs = setuptools_scm
[slapos-command] [slapos-command]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${python-cliff:egg}
${lxml-python:egg} ${lxml-python:egg}
slapos.core slapos.core
slapos.libnetworkcache slapos.libnetworkcache
...@@ -354,6 +356,8 @@ chardet = 3.0.4 ...@@ -354,6 +356,8 @@ chardet = 3.0.4
# requests==2.24.0 # requests==2.24.0
urllib3 = 1.25.9 urllib3 = 1.25.9
pkgconfig = 1.5.1
[networkcache] [networkcache]
download-cache-url = http://shacache.nxdcdn.com download-cache-url = http://shacache.nxdcdn.com
download-dir-url = http://shadir.nxdcdn.com download-dir-url = http://shadir.nxdcdn.com
......
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