Merge remote-tracking branch 'origin/master' into erp5-component

component/slapos/buildout.cfg

 # This file is used to install SlapOS Node itself.
-
 [buildout]
 extends =
+  ../../stack/slapos.cfg
   ../../stack/shacache-client.cfg
   ../bison/buildout.cfg
-  ../bzip2/buildout.cfg
   ../gdbm/buildout.cfg
   ../gettext/buildout.cfg
-  ../glib/buildout.cfg
-  ../libxml2/buildout.cfg
-  ../libxslt/buildout.cfg
-  ../lxml-python/buildout.cfg
   ../m4/buildout.cfg
-  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../popt/buildout.cfg
   ../python-2.7/buildout.cfg
-  ../python-cffi/buildout.cfg
-  ../python-cryptography/buildout.cfg
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
-  ../zlib/buildout.cfg
   ../patch/buildout.cfg
 
 parts =
@@ -31,22 +19,7 @@ parts =
   sh-environment
   py
 
-find-links =
-  http://www.nexedi.org/static/packages/source/slapos.buildout/
-  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
-
-versions = versions
-
-allow-hosts =
-  *.googlecode.com
-  *.nexedi.org
-  *.python.org
-  alastairs-place.net
-  code.google.com
-  github.com
-  peak.telecommunity.com
 
-unzip = true
 
 # separate from system python
 include-site-packages = false
@@ -130,35 +103,27 @@ interpreter = py
 scripts = py
 
 [versions]
-# Use our own buildout version
-zc.buildout = 1.6.0-dev-SlapOS-012
+# Use setuptools-1.x for python 2.4/2.5 support
+setuptools = 1.4.2
 
-# Force to use zc.recipe.egg 1.x
-zc.recipe.egg = 1.3.2
-
-# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
-hexagonit.recipe.download = 1.7nxd002
-
-slapos.core = 1.0.3
-Jinja2 = 2.7.1
-MarkupSafe = 0.18
-Pygments = 1.6
+Jinja2 = 2.7.2
+MarkupSafe = 0.19
 Werkzeug = 0.9.4
-buildout-versions = 1.7
-cffi = 0.8.1
+cffi = 0.8.2
 cmd2 = 0.6.7
-collective.recipe.template = 1.10
-cryptography = 0.2.1
+collective.recipe.template = 1.11
+cryptography = 0.2.2
 itsdangerous = 0.23
-lxml = 3.2.3
+lxml = 3.3.3
 meld3 = 0.6.10
 netaddr = 0.7.10
 prettytable = 0.7.2
 pyOpenSSL = 0.14
 pyparsing = 2.0.1
-setuptools = 1.1.6
+six = 1.5.2
+slapos.core = 1.0.3
 slapos.libnetworkcache = 0.13.4
-slapos.recipe.cmmi = 0.1.1
+slapos.recipe.cmmi = 0.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
@@ -168,23 +133,23 @@ Flask = 0.10.1
 
 # Required by:
 # slapos.core==1.0.3
-bpython = 0.12
+cliff = 1.5.2
 
 # Required by:
 # slapos.core==1.0.3
-cliff = 1.4.5
+netifaces = 0.8
 
 # Required by:
-# slapos.core==1.0.3
-ipython = 1.1.0
+# cffi==0.8.2
+pycparser = 2.10
 
 # Required by:
 # slapos.core==1.0.3
-netifaces = 0.8
+requests = 2.2.1
 
 # Required by:
-# slapos.core==1.0.3
-requests = 2.1.0
+# cliff==1.5.2
+stevedore = 0.14.1
 
 # Required by:
 # slapos.core==1.0.3
@@ -192,4 +157,4 @@ supervisor = 3.0
 
 # Required by:
 # slapos.core==1.0.3
-zope.interface = 4.0.5
+zope.interface = 4.1.0

software/erp5testnode/software.cfg

@@ -5,9 +5,6 @@ find-links += http://dist.repoze.org
 
 extends =
   ../../stack/slapos.cfg
-  ../../component/python-2.7/buildout.cfg
-  ../../component/python-cffi/buildout.cfg
-  ../../component/python-cryptography/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/zip/buildout.cfg

software/seleniumrunner/software.cfg

@@ -4,9 +4,6 @@ extensions = buildout-versions
 extends =
    ../../component/xorg/buildout.cfg
    ../../component/lxml-python/buildout.cfg
-   ../../component/python-2.7/buildout.cfg
-   ../../component/python-cffi/buildout.cfg
-   ../../component/python-cryptography/buildout.cfg
    ../../component/firefox/buildout.cfg
    ../../component/dash/buildout.cfg
    ../../stack/shacache-client.cfg