Merge branch 'saas' into saas-dev

This commit is contained in:
Albert Santoni 2015-05-21 15:05:20 -04:00
commit 16fe0aa177
2 changed files with 4 additions and 1 deletions

View File

@ -9,6 +9,8 @@ import pickle
import threading import threading
from urlparse import urlparse from urlparse import urlparse
requests.packages.urllib3.disable_warnings()
class PicklableHttpRequest: class PicklableHttpRequest:
def __init__(self, method, url, data, api_key): def __init__(self, method, url, data, api_key):
self.method = method self.method = method

View File

@ -23,12 +23,13 @@ setup(name='airtime_analyzer',
install_requires=[ install_requires=[
'mutagen', 'mutagen',
'pika', 'pika',
'daemon',
'python-magic', 'python-magic',
'nose', 'nose',
'coverage', 'coverage',
'mock', 'mock',
'python-daemon==1.6', 'python-daemon==1.6',
'requests', 'requests>=2.7.0',
'apache-libcloud', 'apache-libcloud',
'rgain', 'rgain',
'boto', 'boto',