Merge branch 'flamenco'

README.md

@@ -22,6 +22,7 @@ cd /data/git
 git clone git://git.blender.org/pillar-python-sdk.git
 git clone git://git.blender.org/pillar-server.git pillar
 git clone git://git.blender.org/attract.git
+git clone git://git.blender.org/flamenco.git
 git clone git://git.blender.org/blender-cloud.git
 ```
 

cloud.py

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

deploy.sh

@@ -31,39 +31,37 @@ if [ -n "$(git log origin/production..production --oneline)" ]; then
     read dummy
 fi
 
-# Find Pillar
-PILLAR_DIR=$(python <<EOT
+function find_module()
+{
+    MODULE_NAME=$1
+    MODULE_DIR=$(python <<EOT
 from __future__ import print_function
 import os.path
 try:
-    import pillar
+    import ${MODULE_NAME}
 except ImportError:
-    raise SystemExit('Pillar not found on Python path. Are you in the correct venv?')
+    raise SystemExit('${MODULE_NAME} not found on Python path. Are you in the correct venv?')
 
-print(os.path.dirname(os.path.dirname(pillar.__file__)))
+print(os.path.dirname(os.path.dirname(${MODULE_NAME}.__file__)))
 EOT
 )
-if [ $(git -C $PILLAR_DIR rev-parse --abbrev-ref HEAD) != "production" ]; then
-    echo "Pillar ($PILLAR_DIR) NOT on the production branch, refusing to deploy." >&2
-    exit 1
-fi
 
-# Find Attract
-ATTRACT_DIR=$(python <<EOT
-from __future__ import print_function
-import os.path
-try:
-    import attract
-except ImportError:
-    raise SystemExit('Attract not found on Python path. Are you in the correct venv?')
+    if [ $(git -C $MODULE_DIR rev-parse --abbrev-ref HEAD) != "production" ]; then
+        echo "${MODULE_NAME}: ($MODULE_DIR) NOT on the production branch, refusing to deploy." >&2
+        exit 1
+    fi
 
-print(os.path.dirname(os.path.dirname(attract.__file__)))
-EOT
-)
-if [ $(git -C $ATTRACT_DIR rev-parse --abbrev-ref HEAD) != "production" ]; then
-    echo "Attract ($ATTRACT_DIR) NOT on the production branch, refusing to deploy." >&2
-    exit 1
-fi
+    echo $MODULE_DIR
+}
+
+# Find our modules
+PILLAR_DIR=$(find_module pillar)
+ATTRACT_DIR=$(find_module attract)
+FLAMENCO_DIR=$(find_module flamenco)
+
+echo "Pillar  : $PILLAR_DIR"
+echo "Attract : $ATTRACT_DIR"
+echo "Flamenco: $FLAMENCO_DIR"
 
 # SSH to cloud to pull all files in
 function git_pull() {
@@ -81,6 +79,7 @@ function git_pull() {
 git_pull pillar-python-sdk master
 git_pull pillar production
 git_pull attract production
+git_pull flamenco production
 git_pull blender-cloud production
 
 # Update the virtualenv
@@ -88,6 +87,7 @@ git_pull blender-cloud production
 
 # RSync the world
 $ATTRACT_DIR/rsync_ui.sh
+$FLAMENCO_DIR/rsync_ui.sh
 ./rsync_ui.sh
 
 # Notify Bugsnag of this new deploy.

docker/3_run/000-default.conf

@@ -4,6 +4,7 @@
 	XSendFilePath /data/storage/pillar
 	XSendFilePath /data/git/pillar
 	XSendFilePath /data/venv/lib/python2.7/site-packages/attract/static/
+	XSendFilePath /data/venv/lib/python2.7/site-packages/flamenco/static/
 	XsendFilePath /data/git/blender-cloud
 
 	ServerAdmin webmaster@localhost

docker/3_run/docker-entrypoint.sh

@@ -7,6 +7,8 @@ if [ ! -f /installed ]; then
     ln -s /data/git/pillar/pillar /data/venv/lib/python2.7/site-packages/pillar
     # . /data/venv/bin/activate && pip install -e /data/git/attract
     ln -s /data/git/attract/attract /data/venv/lib/python2.7/site-packages/attract
+    # . /data/venv/bin/activate && pip install -e /data/git/flamenco
+    ln -s /data/git/flamenco/flamenco /data/venv/lib/python2.7/site-packages/flamenco
     # . /data/venv/bin/activate && pip install -e /data/git/pillar-python-sdk
     ln -s /data/git/pillar-python-sdk/pillarsdk /data/venv/lib/python2.7/site-packages/pillarsdk
     touch installed

docker/docker-compose.yml

@@ -21,6 +21,7 @@ blender_cloud:
   volumes:
    - /data/git/blender-cloud:/data/git/blender-cloud:ro
    - /data/git/attract:/data/git/attract:ro
+   - /data/git/flamenco:/data/git/flamenco:ro
    - /data/git/pillar:/data/git/pillar:ro
    - /data/git/pillar-python-sdk:/data/git/pillar-python-sdk:ro
    - /data/config:/data/config:ro

requirements.txt

@@ -2,6 +2,7 @@
 # pillarsdk
 # pillar
 # attract
+# flamenco
 
 # Secondary requirements (i.e. pulled in from primary requirements)
 algoliasearch==1.8.0
@@ -47,6 +48,7 @@ pyasn1==0.1.9
 pyasn1-modules==0.0.8
 pycparser==2.14
 pycrypto==2.6.1
+pylru==1.0.4
 pymongo==3.3.0
 pyOpenSSL==0.15.1
 python-dateutil==2.5.3