slaprunner: new software release targeting Python 3

software/slaprunner/software-py3.cfg

+[buildout]
+extends =
+  ../../component/python3/buildout.cfg
+  software.cfg
+
+python = python3
+
+# Ignore these for now
+common-parts -=
+  rdiff-backup
+
+[eggs]
+eggs -=
+# futures is a backport of Py3's concurrent.futures module
+  futures

software/slaprunner/software.cfg

@@ -154,6 +154,7 @@ eggs =
   slapos.recipe.build
   slapos.toolbox[flask_auth]
   gunicorn==19.7.1
+# for gunicorn[gthread]
   futures
   ${slapos-cookbook:eggs}
   slapos.core # listed explicitly for scripts generation

software/slaprunner/test/test.py

@@ -38,13 +38,15 @@ from six.moves.urllib.parse import quote
 from six.moves.urllib.parse import urljoin
 from six.moves.configparser import ConfigParser
 import requests
+import six
 
 from slapos.recipe.librecipe import generateHashFromFiles
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
-        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
+        os.path.join(os.path.dirname(__file__), '..',
+                     'software%s.cfg' % ("-py3" if six.PY3 else ""))))
 
 
 class SlaprunnerTestCase(SlapOSInstanceTestCase):