Commit eacc0038 authored by Kirill Smelkov's avatar Kirill Smelkov

*: Factor-out NumPy version into component/numpy/

Move `numpy=1.16.4` from all over the place into component/numpy.
Don't move if a different numpy version is used, or it looks like a
software cares to use exactly particular version.
Downgrade pygolang/test.cfg from numpy=1.16.6 to numpy=1.16.4 and use
common numpy component version - using numpy=1.16.6 is not required for
pygolang testing and so this downgrade is acceptable. It will be better
to upgrade NumPy to latest in component/numpy/ as a future separate step.

See previous patch where it was decided and explained that version for
component <X> lives in component/X/.
parent 97444968
......@@ -4,3 +4,7 @@ parts = numpy
[numpy]
recipe = zc.recipe.egg:custom
egg = numpy
[versions]
numpy = 1.16.4
......@@ -4,6 +4,7 @@
extends =
../../stack/nxdtest.cfg
../pytest/buildout.cfg
../numpy/buildout.cfg
buildout-dev.cfg
parts =
......@@ -46,7 +47,6 @@ template = inline:
[versions]
numpy = 1.16.6
ipython = 5.10.0
ipython-genutils = 0.2.0
......
......@@ -11,6 +11,7 @@ extends =
../../component/6tunnel/buildout.cfg
../../component/xz-utils/buildout.cfg
../../component/rsyslogd/buildout.cfg
../../component/numpy/buildout.cfg
../../component/haproxy/buildout.cfg
../../component/nginx/buildout.cfg
......@@ -258,7 +259,6 @@ pycrypto = 2.6.1
rdiff-backup = 1.0.5+SlapOSPatched001
slapos.recipe.template = 4.4
smmap = 0.9.0
numpy = 1.16.4
websockify = 0.8.0
furl = 2.1.0
......
......@@ -102,5 +102,4 @@ context =
[versions]
slapos.recipe.template = 4.4
coverage = 4.5.1
numpy = 1.16.4
pycodestyle = 2.5.0
......@@ -40,7 +40,6 @@ rpy2 = 2.4.0
pydot = 1.0.28
xlrd = 0.9.3
xlwt = 0.7.5
numpy = 1.16.4
scipy = 0.13.3
simpy = 3.0.5
zope.dottedname = 4.1.0
......
......@@ -10,6 +10,7 @@ extends =
../../component/netcat/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/pycurl/buildout.cfg
../../component/numpy/buildout.cfg
../../component/gzip/buildout.cfg
../../stack/slapos.cfg
../../component/nodejs/buildout.cfg
......@@ -206,4 +207,3 @@ gitdb = 0.6.4
pycurl = 7.43.0
slapos.recipe.template = 4.4
smmap = 0.9.0
numpy = 1.16.4
......@@ -18,6 +18,7 @@ extends =
../../component/coreutils/buildout.cfg
../../component/util-linux/buildout.cfg
../../component/pygolang/buildout.cfg
../../component/numpy/buildout.cfg
../../stack/nxdtest.cfg
......@@ -106,7 +107,7 @@ eggs =
# wendelin.core still requires ZODB3 but having ZODB4 or 5 installed satisfies latest ZODB3
ZODB3
# also for wc
numpy
${numpy:egg}
# to install not only wendelin.core modules but also scripts
wendelin.core
# for ZEO scripts (runzeo)
......@@ -124,7 +125,6 @@ revision= v0.11-15-gf785ac079b
# ping eggs versions
[versions]
ZODB3 = 3.11.0
numpy = 1.16.4
zope.testing = 4.6.2
# Required by:
......
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