Skip to content

Commit

Permalink
Various fixes;
Browse files Browse the repository at this point in the history
 * 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)
  • Loading branch information
xfxf committed Oct 27, 2015
1 parent bdf66ef commit 11f7c89
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
tests.txt
dictionary.txt
pw.*
auth.json
Expand Down
5 changes: 5 additions & 0 deletions INSTALL.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion dj/scripts/addeps.py
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions dj/scripts/sample_pw.py
Expand Up @@ -9,6 +9,7 @@
}
}
bitly = {'user':'fred', 'password':'R_longstringofstuff'}
addeps = {}

yt = {
'veyepar_test':{
Expand Down
3 changes: 1 addition & 2 deletions dj/scripts/sample_veyepar.cfg
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions setup/requirements.txt
Expand Up @@ -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

0 comments on commit 11f7c89

Please sign in to comment.