[LNT] r274063 - Install stuff based on reqirements files

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Tue Jun 28 15:49:30 2016
New Revision: 274063

URL: http://llvm.org/viewvc/llvm-project?rev=274063&view=rev
Log:
Install stuff based on reqirements files

Add more requirements files so that we can do big server installs and
local client installs.

Added:
    lnt/trunk/requirements.client.txt
      - copied, changed from r274062, lnt/trunk/requirements.txt
    lnt/trunk/requirements.server.txt
      - copied, changed from r274062, lnt/trunk/requirements.txt
Removed:
    lnt/trunk/requirements.txt
Modified:
    lnt/trunk/setup.py

Copied: lnt/trunk/requirements.client.txt (from r274062, lnt/trunk/requirements.txt)
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/requirements.client.txt?p2=lnt/trunk/requirements.client.txt&p1=lnt/trunk/requirements.txt&r1=274062&r2=274063&rev=274063&view=diff
==============================================================================
--- lnt/trunk/requirements.txt (original)
+++ lnt/trunk/requirements.client.txt Tue Jun 28 15:49:30 2016
@@ -1,3 +1,4 @@
+# Flask 0.11 does not work yet.
 Flask==0.10.1
 Flask-RESTful==0.3.4
 Jinja2==2.7.2
@@ -7,15 +8,10 @@ SQLAlchemy==0.9.4
 Werkzeug==0.9.4
 aniso8601==1.0.0
 argparse==1.3.0
-gunicorn==18.0
-heroku==0.1.4
 itsdangerous==0.24
-progressbar==2.3
-psycopg2==2.5.3
 python-dateutil==1.5
 python-gnupg==0.3.7
 pytz==2015.4
-requests==2.3.0
 six==1.9.0
 wsgiref==0.1.2
 WTForms==2.0.2

Copied: lnt/trunk/requirements.server.txt (from r274062, lnt/trunk/requirements.txt)
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/requirements.server.txt?p2=lnt/trunk/requirements.server.txt&p1=lnt/trunk/requirements.txt&r1=274062&r2=274063&rev=274063&view=diff
==============================================================================
--- lnt/trunk/requirements.txt (original)
+++ lnt/trunk/requirements.server.txt Tue Jun 28 15:49:30 2016
@@ -1,3 +1,7 @@
+# These requirements are what you would install on a production server.
+
+psycopg2==2.5.3
+# Flask 0.11 does not work yet.
 Flask==0.10.1
 Flask-RESTful==0.3.4
 Jinja2==2.7.2
@@ -11,7 +15,6 @@ gunicorn==18.0
 heroku==0.1.4
 itsdangerous==0.24
 progressbar==2.3
-psycopg2==2.5.3
 python-dateutil==1.5
 python-gnupg==0.3.7
 pytz==2015.4

Removed: lnt/trunk/requirements.txt
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/requirements.txt?rev=274062&view=auto
==============================================================================
--- lnt/trunk/requirements.txt (original)
+++ lnt/trunk/requirements.txt (removed)
@@ -1,22 +0,0 @@
-Flask==0.10.1
-Flask-RESTful==0.3.4
-Jinja2==2.7.2
-MarkupSafe==0.23
-PyYAML==3.11
-SQLAlchemy==0.9.4
-Werkzeug==0.9.4
-aniso8601==1.0.0
-argparse==1.3.0
-gunicorn==18.0
-heroku==0.1.4
-itsdangerous==0.24
-progressbar==2.3
-psycopg2==2.5.3
-python-dateutil==1.5
-python-gnupg==0.3.7
-pytz==2015.4
-requests==2.3.0
-six==1.9.0
-wsgiref==0.1.2
-WTForms==2.0.2
-Flask-WTF==0.12

Modified: lnt/trunk/setup.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/setup.py?rev=274063&r1=274062&r2=274063&view=diff
==============================================================================
--- lnt/trunk/setup.py (original)
+++ lnt/trunk/setup.py Tue Jun 28 15:49:30 2016
@@ -1,6 +1,8 @@
+from pip.req import parse_requirements
 import lnt
 import os
 from sys import platform as _platform
+import sys
 from setuptools import setup, find_packages, Extension
 
 cflags = []
@@ -21,6 +23,16 @@ cPerf = Extension('lnt.testing.profile.c
                   extra_compile_args=['-std=c++11'] + cflags,
                   optional=True)
 
+if "--server" in sys.argv:
+    sys.argv.remove("--server")
+    req_file = "requirements.server.txt"
+else:
+    req_file = "requirements.client.txt"
+
+install_reqs = parse_requirements(req_file, session=False)
+
+reqs = [str(ir.req) for ir in install_reqs]
+
 setup(
     name = "LNT",
     version = lnt.__version__,
@@ -103,11 +115,7 @@ http://llvm.org/svn/llvm-project/lnt/tru
             'lnt = lnt.lnttool:main',
             ],
         },
-    install_requires=['WTForms',
-                      'Flask-WTF',
-                      'Flask-RESTful',
-                      'SQLAlchemy',
-                      'Flask<0.11'],
+    install_requires=reqs,
 
     ext_modules = [cPerf],
 )