From c15db7c141a1459fe8bf6b028a8a2a7ccd3ff377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 20 Feb 2020 02:35:53 +0100
Subject: [PATCH] Revert "slaprunner: ..."

This reverts commit 2cc61477e909fe48201df6fc8e599102e9f6f81f.

Now we now, without "futures" egg, gunicorn refuses to start:

    Error: class uri 'gunicorn.workers.gthread.ThreadWorker' invalid or not found:

    [Traceback (most recent call last):
      File "/srv/slapgrid/slappart14/srv/testnode/cqc/inst/test0-0/tmp/soft/8c22f5a21e7f016f38916f098ab2339b/eggs/gunicorn-19.7.1-py2.7.egg/gunicorn/util.py", line 134, in load_class
	mod = import_module('.'.join(components))
      File "/srv/slapgrid/slappart14/srv/testnode/cqc/inst/test0-0/tmp/shared/python2.7/8d8826883d34c5a7ec7a5b8c187d89c9/lib/python2.7/importlib/__init__.py", line 37, in import_module
	__import__(name)
      File "/srv/slapgrid/slappart14/srv/testnode/cqc/inst/test0-0/tmp/soft/8c22f5a21e7f016f38916f098ab2339b/eggs/gunicorn-19.7.1-py2.7.egg/gunicorn/workers/gthread.py", line 37, in <module>
	""")
    RuntimeError:
	You need to install the 'futures' package to use this worker with this
	Python version.
---
 software/slaprunner/software.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/software/slaprunner/software.cfg b/software/slaprunner/software.cfg
index b8880d00f..0e5554bb8 100644
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -152,6 +152,7 @@ eggs =
   slapos.recipe.build
   slapos.toolbox[flask_auth]
   gunicorn==19.7.1
+  futures
   ${slapos-cookbook:eggs}
   slapos.core # listed explicitly for scripts generation
 
@@ -164,6 +165,7 @@ eggs +=
 [versions]
 Flask-Auth = 0.85
 cns.recipe.symlink = 0.2.3
+futures = 3.0.5
 gitdb = 0.6.4
 gunicorn = 19.7.1
 prettytable = 0.7.2
-- 
2.30.9