A proper way of dependencies handling.

toolset/setup/linux/installer.py

@@ -424,6 +424,8 @@ class Installer:
     easy_install('tornado==3.1', two=True, three=True, pypy=True)
     easy_install('motor==0.1.2', two=True, three=True, pypy=True)
     easy_install('pymongo==2.5.2', two=True, three=True, pypy=True)
+    easy_install('psycopg2==2.5.3', two=True, three=True, pypy=True)
+    easy_install('Momoko==1.1.3', two=True, three=True, pypy=True)
 
     # Django
     easy_install("https://www.djangoproject.com/download/1.6/tarball/", two=True, three=True, pypy=True)

tornado/requirements.txt

@@ -1,4 +1,2 @@
 tornado
 motor
-psycopg2
-Momoko

tornado/setup_pg.py

@@ -11,8 +11,6 @@ cwd = os.path.expanduser('~/FrameworkBenchmarks/tornado')
 
 
 def start(args, logfile, errfile):
-    subprocess.call(pip + ' install -r requirements.txt', cwd=cwd, shell=True, stderr=errfile, stdout=logfile)
-
     subprocess.Popen(
         python + ' server.py --port=8080 --postgres=%s --logging=error' % (args.database_host,),
         shell=True, cwd=cwd, stderr=errfile, stdout=logfile)