Re-enabled Flamenco, as it seems to be working on Py36

This commit is contained in:
2017-03-03 17:37:13 +01:00
parent df137c3258
commit 4a148f9163
2 changed files with 6 additions and 5 deletions

View File

@@ -2,14 +2,14 @@
from pillar import PillarServer from pillar import PillarServer
from attract import AttractExtension from attract import AttractExtension
# from flamenco import FlamencoExtension from flamenco import FlamencoExtension
attract = AttractExtension() attract = AttractExtension()
# flamenco = FlamencoExtension() flamenco = FlamencoExtension()
app = PillarServer('.') app = PillarServer('.')
app.load_extension(attract, '/attract') app.load_extension(attract, '/attract')
# app.load_extension(flamenco, '/flamenco') app.load_extension(flamenco, '/flamenco')
app.process_extensions() app.process_extensions()
if __name__ == '__main__': if __name__ == '__main__':

View File

@@ -1,8 +1,9 @@
# Primary requirements # Primary requirements
# flamenco
-r ../pillar/requirements.txt -r ../pillar/requirements.txt
-r ../attract/requirements.txt -r ../attract/requirements.txt
-r ../flamenco/requirements.txt
-e ../pillar-python-sdk -e ../pillar-python-sdk
-e ../pillar -e ../pillar
-e ../attract -e ../attract
-e ../flamenco