[slapos-testing] Fix and upgrade setup of setuptools for testing

component/python-setuptools/buildout.cfg

@@ -4,9 +4,10 @@ parts = python-setuptools
 [setuptools-download]
 recipe = hexagonit.recipe.download
 download-only = true
-filename = setuptools-0.6c11-py2.7.egg
-url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
-md5sum = fe1f997bc722265116870bc7919059ea
+package_suffix = setuptools-1.4.2
+filename = ${:package_suffix}.tar.gz
+url = https://pypi.python.org/packages/source/s/setuptools/${:filename}
+md5sum = 13951be6711438073fbe50843e7f141f
 mode = 0644
 
 [python-setuptools]
@@ -16,9 +17,10 @@ mode = 0644
 # To be able to use it, you should in your instance do an:
 # export PYTHONPATH=${:location} (defined in ${:environment})
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:location};
+pythonpath = ${:location}/${setuptools-download:package_suffix}
+environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:pythonpath};
 stop-on-error = true
 recipe = plone.recipe.command
 update = true
 # chmod is a hack, but the mode of hexagonit.recipe.download above didn't worked yet (there was new version recently)
-command = ${:environment} (mkdir ${:location}; chmod 644 ${setuptools-download:location}/${setuptools-download:filename} ; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)
+command = ${:environment} (mkdir ${:location}; cd ${:location} && tar -xzvf ${setuptools-download:location}/${setuptools-download:filename} && cd ${:pythonpath} && ${buildout:executable} setup.py build) || (rm -fr ${:location}; exit 1)

software/slapos-testing/instance.cfg

@@ -50,7 +50,7 @@ environment = environment
 CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
 LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${python2.7:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${libxslt:location}/lib -Wl,-rpath=${zlib:location}/lib
 LD_LIBRARY_PATH = ${python2.7:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libxslt:location}/lib:${zlib:location}/lib
-PYTHONPATH = ${python-setuptools:location}
+PYTHONPATH = ${python-setuptools:pythonpath}
 
 [sh-environment]
 # Section exposes testing default environment as sh file. It is thus easy

software/slapos-testing/software.cfg

@@ -61,7 +61,7 @@ branch = master
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 1dba62d737ef76dfac50febd61357041
+md5sum = 7a8be25961238f8e11d5de95d2f05598
 output =  ${buildout:directory}/template.cfg
 mode = 640
 
@@ -98,68 +98,4 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-erp5.util = 0.4.7
-hexagonit.recipe.cmmi = 1.6
-lxml = 2.3.6
-meld3 = 0.6.8
-plone.recipe.command = 1.1
-slapos.cookbook = 0.65
-slapos.libnetworkcache = 0.13.2
-slapos.recipe.build = 0.11.2
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.4.2
-
-# Required by:
-# slapos.core==0.28.5
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook==0.65
-PyXML = 0.8.4
-
-# Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6nxd002
-
-# Required by:
-# slapos.cookbook==0.65
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.65
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.28.5
-netifaces = 0.8
-
-# Required by:
-# erp5.util==0.4.7
-# slapos.cookbook==0.65
-# slapos.core==0.28.5
-# zc.buildout==1.6.0-dev-SlapOS-006
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.65
-slapos.core = 0.28.5
-
-# Required by:
-# slapos.core==0.28.5
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.65
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.65
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.28.5
-zope.interface = 4.0.1
+setuptools = 1.4.2