From 11f7c896c725c6f166dc3aa4cffde9fb350ae2b8 Mon Sep 17 00:00:00 2001
From: Ryan Verner <ryan.verner@gmail.com>
Date: Wed, 28 Oct 2015 09:58:05 +1100
Subject: [PATCH] Various fixes;  * Adds missing ubuntu/python packages  *
 Fixes typo in sample_veyepar.cfg  * Adds missing addeps dict to sample_pw.py
 + makes this conditional in addeps.py  * Adds tests.txt to .gitignore (assume
 generated, shouldn't be committed)

---
 .gitignore                    | 1 +
 INSTALL.sh                    | 5 +++++
 dj/scripts/addeps.py          | 7 ++++++-
 dj/scripts/sample_pw.py       | 1 +
 dj/scripts/sample_veyepar.cfg | 3 +--
 setup/requirements.txt        | 5 +++++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab4bc737..f04f7e38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+tests.txt
 dictionary.txt
 pw.*
 auth.json
diff --git a/INSTALL.sh b/INSTALL.sh
index 03630150..c46b93aa 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -32,6 +32,8 @@ sudo apt-get --assume-yes update
 
 sudo apt-get --assume-yes install python-gtk2 gocr imagemagick python-imaging python-reportlab python-pip mercurial subversion inkscape ffmpeg2theora mplayer vlc git vim mencoder python-virtualenv screen sox melt python-dev python-gst-1.0 gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-libav gir1.2-gstreamer-1.0
 
+sudo apt-get --assume-yes install libyaml-dev libjpeg-dev
+
 # python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-plugins-bad 
 # python-lxml 
 # python-dev libxml2-dev libxslt-dev
@@ -90,6 +92,9 @@ ln -s /usr/lib/python2.7/dist-packages/gi
 git clone https://github.com/dabodev/dabo.git dabo-master
 ln -s dabo-master/dabo 
 
+# force latest six
+pip uninstall six -y; pip install six
+
 # to hookinto local open-cv
 # python -c "import cv2;print cv2.__file__" 
 # /usr/lib/python2.7/dist-packages/cv2.so
diff --git a/dj/scripts/addeps.py b/dj/scripts/addeps.py
index 89976ca4..6b95e0fc 100755
--- a/dj/scripts/addeps.py
+++ b/dj/scripts/addeps.py
@@ -3008,7 +3008,12 @@ def one_show(self, show):
             session = requests.session()
 
             # auth stuff goes here, kinda.
-            auth = pw.addeps.get(self.options.client, None)
+            
+	    try:
+		auth = pw.addeps.get(self.options.client, None)
+	    except:
+		auth = None
+
             if auth is not None:
                 if self.options.verbose: print auth
 
diff --git a/dj/scripts/sample_pw.py b/dj/scripts/sample_pw.py
index 57601934..20347db0 100644
--- a/dj/scripts/sample_pw.py
+++ b/dj/scripts/sample_pw.py
@@ -9,6 +9,7 @@
 } 
    }
 bitly = {'user':'fred', 'password':'R_longstringofstuff'}
+addeps = {}
 
 yt = {
 'veyepar_test':{
diff --git a/dj/scripts/sample_veyepar.cfg b/dj/scripts/sample_veyepar.cfg
index 62a6616c..b0023a6c 100644
--- a/dj/scripts/sample_veyepar.cfg
+++ b/dj/scripts/sample_veyepar.cfg
@@ -24,12 +24,11 @@
 
 upload_formats=mp4 
 
-lincense=CC BY-NA
+license=CC BY-NA
 
 host_user=veyepar_test
 twitter_user=veyepar_test
 
-
 client=test_client
 show=test_show
 
diff --git a/setup/requirements.txt b/setup/requirements.txt
index d10ccbc1..b47a7a60 100644
--- a/setup/requirements.txt
+++ b/setup/requirements.txt
@@ -46,3 +46,8 @@ git+https://github.com/CarlFK/google-api-python-client.git#egg=googleapiclient
 # for util/dirmon.py
 git+https://github.com/maliubiao/python_inotify.git 
 
+python-keystoneclient
+oslo.utils
+oslo.serialization
+boto
+beautifulsoup4