Move apache-libcloud and pyasn1 versions to stack/slapos.cfg

They are dependencies of slapos.toolbox and we already agreed to put slapos.toolbox version in a shared file. /cc @jerome @jm /reviewed-on nexedi/slapos!502

Move apache-libcloud and pyasn1 versions to stack/slapos.cfg
They are dependencies of slapos.toolbox and we already agreed to put slapos.toolbox version in a shared file. /cc @jerome @jm /reviewed-on nexedi/slapos!502
284719a5 · Thomas Gambier · c6733656 · 284719a5 · 284719a5 · 284719a5
Commit 284719a5 authored Jan 17, 2019 by Thomas Gambier 🚴🏼
54 changed files
--- a/software/agent/software.cfg
+++ b/software/agent/software.cfg
@@ -43,7 +43,6 @@ eggs =


 [versions]
-apache-libcloud = 0.18.0
 ecdsa = 0.13
 erp5.util = 0.4.51
 gitdb = 0.6.4

--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
@@ -3,7 +3,6 @@ extends = common.cfg

 [versions]
 PyRSS2Gen = 1.1
-apache-libcloud = 0.19.0
 cns.recipe.symlink = 0.2.3
 ecdsa = 0.13
 gitdb = 0.6.4
@@ -13,7 +12,6 @@ rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 4.3
 smmap = 0.9.0
 numpy = 1.11.2
-pyasn1 = 0.2.3

 websockify = 0.8.0

--- a/software/backupserver/software.cfg
+++ b/software/backupserver/software.cfg
@@ -123,7 +123,6 @@ gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2
 PyRSS2Gen = 1.1
-apache-libcloud = 2.3.0
 gitdb2 = 2.0.5
 smmap2 = 2.0.5

--- a/software/caddy-frontend/software.cfg
+++ b/software/caddy-frontend/software.cfg
@@ -4,7 +4,6 @@ extends = common.cfg
 [versions]
 validators = 0.12.2
 PyRSS2Gen = 1.1
-apache-libcloud = 0.19.0
 cns.recipe.symlink = 0.2.3
 ecdsa = 0.13
 gitdb = 0.6.4
@@ -14,6 +13,5 @@ rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 4.3
 smmap = 0.9.0
 numpy = 1.11.2
-pyasn1 = 0.2.3

 websockify = 0.8.0
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
@@ -67,7 +67,6 @@ dnspython = 1.15.0
 PyXML = 0.8.5
 WebOb = 1.8.2
 WebTest = 2.0.30
-apache-libcloud = 2.3.0
 gitdb2 = 2.0.4
 smmap2 = 2.0.4
 waitress = 1.1.0

--- a/software/html5as/software.cfg
+++ b/software/html5as/software.cfg
@@ -67,7 +67,6 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

 [versions]
-apache-libcloud = 0.12.3
 async = 0.6.1
 gitdb = 0.5.4
 pycrypto = 2.6

--- a/software/htmlvalidatorserver/software.cfg
+++ b/software/htmlvalidatorserver/software.cfg
@@ -55,7 +55,6 @@ gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2
 inotifyx = 0.2.2
-apache-libcloud = 2.2.1
 gitdb2 = 2.0.3
 smmap2 = 2.0.3

--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -256,7 +256,6 @@ context =
 websockify = 0.5.1

 erp5.util = 0.4.51
-apache-libcloud = 1.1.0
 collective.recipe.environment = 0.2.0
 gitdb = 0.6.4
 pycurl = 7.43.0

--- a/software/monitor/software.cfg
+++ b/software/monitor/software.cfg
@@ -95,7 +95,6 @@ erp5.util = 0.4.51
 passlib = 1.7.1
 GitPython = 2.1.9
 lockfile = 0.12.2
-apache-libcloud = 2.3.0
 feedparser = 5.2.1
 atomize = 0.2.0
 gitdb2 = 2.0.3

--- a/software/neoppod/software-common.cfg
+++ b/software/neoppod/software-common.cfg
@@ -120,7 +120,6 @@ md5sum = 87d18c7021e4d43756813a83c9da5e97
 [versions]
 BTrees = 4.4.1
 ZODB = 4.4.5
-apache-libcloud = 1.5.0
 coverage = 4.5.1
 ecdsa = 0.13
 gitdb2 = 2.0.0
@@ -138,7 +137,6 @@ zodbpickle = 0.6.0
 zodbtools = 0.0.0.dev4
 cython-zstd = 0.2
 python-dateutil = 2.7.3
-pyasn1 = 0.4.3

 # Required by:
 # zodbtools==0.0.0dev4

--- a/software/neotest/software.cfg
+++ b/software/neotest/software.cfg
@@ -120,7 +120,6 @@ revision= v0.11-15-gf785ac079b

 # ping eggs versions
 [versions]
-pyasn1 = 0.3.7
 ZODB3 = 3.11.0
 numpy = 1.14.2
 zope.testing = 4.6.2

--- a/software/nginx-push-stream/software.cfg
+++ b/software/nginx-push-stream/software.cfg
@@ -47,8 +47,6 @@ mode = 0644
 [versions]
 slapos.recipe.template = 4.3
 erp5.util = 0.4.51
-apache-libcloud = 2.2.1
 inotifyx = 0.2.2
 gitdb2 = 2.0.3
-pyasn1 = 0.4.2
 smmap2 = 2.0.3
--- a/software/powerdns/software.cfg
+++ b/software/powerdns/software.cfg
@@ -71,7 +71,6 @@ erp5.util = 0.4.53
 passlib = 1.7.1
 GitPython = 2.1.11
 lockfile = 0.12.2
-apache-libcloud = 2.3.0
 feedparser = 5.2.1
 atomize = 0.2.0
 gitdb2 = 2.0.4

--- a/software/re6stnet/software.cfg
+++ b/software/re6stnet/software.cfg
@@ -110,7 +110,6 @@ md5sum = 0bf4f2c03e06b55c6c6cc55fa33e65d6

 [versions]
 re6stnet = 0.501
-apache-libcloud = 0.17.0
 ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
@@ -122,10 +121,6 @@ dnspython = 1.15.0
 erp5.util = 0.4.51
 passlib = 1.7.1

-# Required by:
-# apache-libcloud==0.17.0
-backports.ssl-match-hostname = 3.4.0.2
-
 # Required by:
 # re6stnet===0-413.gbec6b3c.dirty
 miniupnpc = 1.9

--- a/software/slapos-sr-testing/software.cfg
+++ b/software/slapos-sr-testing/software.cfg
@@ -141,7 +141,6 @@ httplib2 = 0.11.3
 image = 1.5.25
 paramiko = 2.4.2
 plantuml = 0.1.1
-pyasn1 = 0.4.4
 pysftp = 0.2.9
 requests-toolbelt = 0.8.0
 selenium = 3.141.0

--- a/software/slapos-testing/software.cfg
+++ b/software/slapos-testing/software.cfg
@@ -187,7 +187,6 @@ Pygments = 2.1.3
 slapos.recipe.template = 4.3

 # All depencies should be pinned.
-apache-libcloud = 2.3.0
 bcrypt = 3.1.4
 dnspython = 1.15.0
 funcsigs = 1.0.2
@@ -196,7 +195,6 @@ httmock = 1.2.6
 manuel = 1.9.0
 mock = 2.0.0
 pem = 18.1.0
-pyasn1 = 0.4.3
 pycurl = 7.43.0.2
 pyflakes = 2.0.0
 smmap2 = 2.0.4

--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -154,7 +154,6 @@ eggs +=

 [versions]
 Flask-Auth = 0.85
-apache-libcloud = 1.2.1
 cns.recipe.symlink = 0.2.3
 futures = 3.0.5
 gitdb = 0.6.4

--- a/software/unstable/MediaWiki/software.cfg
+++ b/software/unstable/MediaWiki/software.cfg
@@ -55,7 +55,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/b2evolution/software.cfg
+++ b/software/unstable/b2evolution/software.cfg
@@ -40,7 +40,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/cmsmadesimple/software.cfg
+++ b/software/unstable/cmsmadesimple/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/coppermine/software.cfg
+++ b/software/unstable/coppermine/software.cfg
@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/dotclear/software.cfg
+++ b/software/unstable/dotclear/software.cfg
@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/dotproject/software.cfg
+++ b/software/unstable/dotproject/software.cfg
@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/eSKUeL/software.cfg
+++ b/software/unstable/eSKUeL/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/ezpublish/software.cfg
+++ b/software/unstable/ezpublish/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/magento/software.cfg
+++ b/software/unstable/magento/software.cfg
@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/net2ftp/software.cfg
+++ b/software/unstable/net2ftp/software.cfg
@@ -63,7 +63,6 @@ eggs =
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/openX/software.cfg
+++ b/software/unstable/openX/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/os-commerce/software.cfg
+++ b/software/unstable/os-commerce/software.cfg
@@ -40,7 +40,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/phpbb/software.cfg
+++ b/software/unstable/phpbb/software.cfg
@@ -42,7 +42,6 @@ eggs =
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/phpmyadmin/software.cfg
+++ b/software/unstable/phpmyadmin/software.cfg
@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/phpnuke/software.cfg
+++ b/software/unstable/phpnuke/software.cfg
@@ -51,7 +51,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/pimcore/software.cfg
+++ b/software/unstable/pimcore/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/piwigo/software.cfg
+++ b/software/unstable/piwigo/software.cfg
@@ -51,7 +51,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/piwik/software.cfg
+++ b/software/unstable/piwik/software.cfg
@@ -41,7 +41,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/prestashop/software.cfg
+++ b/software/unstable/prestashop/software.cfg
@@ -42,7 +42,6 @@ eggs =
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/punbb/software.cfg
+++ b/software/unstable/punbb/software.cfg
@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/simpleMachineForum/software.cfg
+++ b/software/unstable/simpleMachineForum/software.cfg
@@ -40,7 +40,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/spip/software.cfg
+++ b/software/unstable/spip/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/statusnet/software.cfg
+++ b/software/unstable/statusnet/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/sugar-crm/software.cfg
+++ b/software/unstable/sugar-crm/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/tiki/software.cfg
+++ b/software/unstable/tiki/software.cfg
@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/trac-svn/software.cfg
+++ b/software/unstable/trac-svn/software.cfg
@@ -171,7 +171,6 @@ Genshi = 0.7
 MySQL-python = 1.2.4
 Pygments = 1.6
 Trac = 1.0.1
-apache-libcloud = 0.12.4
 async = 0.6.1
 collective.recipe.cmd = 0.6
 docutils = 0.10

--- a/software/unstable/xoops/software.cfg
+++ b/software/unstable/xoops/software.cfg
@@ -40,7 +40,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/zencart/software.cfg
+++ b/software/unstable/zencart/software.cfg
@@ -52,7 +52,6 @@ eggs =
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

--- a/software/unstable/zimbra-kvm/software.cfg
+++ b/software/unstable/zimbra-kvm/software.cfg
@@ -5,7 +5,6 @@ extends = common.cfg
 numpy = 1.6.2
 Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.12.1
 async = 0.6.1
 buildout-versions = 1.7
 gitdb = 0.5.4

--- a/stack/boinc/buildout.cfg
+++ b/stack/boinc/buildout.cfg
@@ -66,7 +66,6 @@ app-list = {}

 [versions]
 pycrypto = 2.6
-apache-libcloud = 0.12.4
 async = 0.6.1
 gitdb = 0.5.4
 mysqlclient = 1.3.12

--- a/stack/caucase/buildout.cfg
+++ b/stack/caucase/buildout.cfg
@@ -88,7 +88,6 @@ context =

 [versions]
 Flask-User = 0.6.19
-apache-libcloud = 2.1.0
 bcrypt = 3.1.3
 caucase = 0.1.4
 futures = 3.1.1
@@ -142,10 +141,6 @@ blinker = 1.4
 # caucase==0.1.4
 pem = 17.1.0

-# Required by:
-# caucase==0.1.4
-pyasn1 = 0.2.3
-
 # Required by:
 # caucase==0.1.4
 pyasn1-modules = 0.0.9

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -708,7 +708,6 @@ objgraph = 3.1.0
 ply = 3.10
 polib = 1.0.8
 pprofile = 2.0.1
-pyasn1 = 0.2.3
 pyasn1-modules = 0.0.8
 pycountry = 17.1.8
 pycrypto = 2.6.1

--- a/stack/lamp.cfg
+++ b/stack/lamp.cfg
@@ -39,7 +39,6 @@ keep-compile-dir = false

 [versions]
 # Generated automatically by buildout-versions
-apache-libcloud = 0.9.1
 async = 0.6.1
 gitdb = 0.5.4
 mysqlclient = 1.3.12

--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -182,7 +182,6 @@ eggs =
  slapos.toolbox[lampconfigure]

 [versions]
-apache-libcloud = 0.12.3
 async = 0.6.1
 gitdb = 0.5.4
 mysqlclient = 1.3.12

--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
@@ -181,7 +181,6 @@ eggs =
  slapos.toolbox

 [versions]
-apache-libcloud = 0.12.1
 async = 0.6.1
 cp.recipe.cmd = 0.4
 gitdb = 0.5.4

--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
@@ -119,5 +119,4 @@ depends =

 [versions]
 cns.recipe.symlink = 0.2.3
-pyasn1 = 0.3.7

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -169,6 +169,10 @@ smmap2 = 2.0.5
 # slapos.toolbox==0.81
 PyRSS2Gen = 1.1

+# Required by:
+# slapos.toolbox==0.81
+apache-libcloud = 2.4.0
+
 # Required by:
 # slapos.toolbox==0.81
 atomize = 0.2.0
@@ -230,6 +234,10 @@ packaging = 16.8
 # slapos.toolbox==0.81
 passlib = 1.7.1

+# Required by:
+# slapos.toolbox==0.81
+pyasn1 = 0.4.5
+
 # Required by:
 # cffi==1.9.1
 pycparser = 2.17