From 4a148f9163f9e3ea82b3677b3eb1e138519b55af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 3 Mar 2017 17:37:13 +0100
Subject: [PATCH] Re-enabled Flamenco, as it seems to be working on Py36

---
 cloud.py         | 6 +++---
 requirements.txt | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cloud.py b/cloud.py
index a8c95ba..2c0e3ca 100755
--- a/cloud.py
+++ b/cloud.py
@@ -2,14 +2,14 @@
 
 from pillar import PillarServer
 from attract import AttractExtension
-# from flamenco import FlamencoExtension
+from flamenco import FlamencoExtension
 
 attract = AttractExtension()
-# flamenco = FlamencoExtension()
+flamenco = FlamencoExtension()
 
 app = PillarServer('.')
 app.load_extension(attract, '/attract')
-# app.load_extension(flamenco, '/flamenco')
+app.load_extension(flamenco, '/flamenco')
 app.process_extensions()
 
 if __name__ == '__main__':
diff --git a/requirements.txt b/requirements.txt
index d62a4b2..ac5d0d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,9 @@
 # Primary requirements
-# flamenco
-
 -r ../pillar/requirements.txt
 -r ../attract/requirements.txt
+-r ../flamenco/requirements.txt
+
 -e ../pillar-python-sdk
 -e ../pillar
 -e ../attract
+-e ../flamenco