Remove all past crazyness with pip in setup.py

In an attempt to be DRY, we were using the requirements files to get the dependent
packages. Pip has not provided a good interface to do that, and so we have been
broken a number of times.  As pip has evolved, those files can now define dependencies
better, so they are not needed anymore.

In a standard client install (flask webserver and sqlite) we will install the packages
using standard setup.py install_requires.  For server installs pip can be used directly,
and will use the local setup.py to get the non-server requirements.  This is much more
standard.

Docs updated, but Docker change not tests, as I don't have a test environment.

Author: cmatthew

docker/Dockerfile

@@ -4,7 +4,7 @@ RUN apk update \
   && apk add --no-cache --virtual .build-deps git g++ postgresql-dev yaml-dev \
   && apk add --no-cache libpq \
   && git clone https://github.com/llvm/llvm-lnt /var/src/lnt \
-  && python3 /var/src/lnt/setup.py install --server \
+  && python3 -m pip install /var/src/lnt/requirements.server.txt \
   && rm -rf /var/src \
   && apk --purge del .build-deps \
   && mkdir /var/log/lnt

docs/intro.rst

@@ -104,7 +104,6 @@ To install the extra packages for the server config::
     virtualenv venv
     . ./venv/bin/activate
     pip install -r requirements.server.txt
-    python setup.py install --server
     lnt create path/to/data_dir --db-dir postgresql://user@host  # data_dir path will be where lnt data will go.
     cd deployment
     # Now edit app_wrapper.py to have your path/to/data_dir path and the log-file below.

requirements.client.txt

@@ -1,22 +1 @@
-# Flask 0.11 does not work yet.
-six
-aniso8601==1.2.0
-Flask==0.12.2
-Flask-RESTful==0.3.4
-Jinja2==2.7.2
-MarkupSafe==0.23
-SQLAlchemy==1.1.11
-Werkzeug==0.12.2
-itsdangerous==0.24
-python-dateutil==2.6.0
-python-gnupg==0.3.7
-pytz==2016.10
-WTForms==2.0.2
-Flask-WTF==0.12
-typing
-click==6.7
-pyyaml==3.13
-requests
-future
-# Use Monorepo for LIT
--e git+https://github.com/llvm/llvm-project.git#egg=lit&subdirectory=llvm/utils/lit
+.

requirements.server.txt

@@ -1,6 +1,5 @@
 # These requirements are what you would install on a production server.
--r requirements.client.txt
+.
 psycopg2==2.8
-# Flask 0.11 does not work yet.
 gunicorn==18.0
 progressbar2

setup.py

@@ -1,8 +1,4 @@
-try:
-    from pip.req import parse_requirements
-except ImportError:
-    # The req module has been moved to pip._internal in the 10 release.
-    from pip._internal.req import parse_requirements
+from __future__ import print_function
 import lnt
 import os
 from sys import platform as _platform
@@ -31,24 +27,10 @@
 
 if "--server" in sys.argv:
     sys.argv.remove("--server")
-    req_file = "requirements.server.txt"
-else:
-    req_file = "requirements.client.txt"
-try:
-    install_reqs = parse_requirements(req_file, session=False)
-except TypeError:
-    # In old PIP the session flag cannot be passed.
-    install_reqs = parse_requirements(req_file)
-
-try:
-    # Filter out git dependencies, which can't be handled by setuptools.
-    reqs = [ir.requirement for ir in install_reqs
-            if not ir.requirement.startswith("git+")]
-except AttributeError:
-    # Old versions of pip (<20.1) returned a List[InstallRequirement] instead
-    # of a List[ParsedRequirement], which has different member names, and does
-    # not include git dependencies.
-    reqs = [str(ir.req) for ir in install_reqs]
+    print("Use pip to install requirements.server.txt for a full server install:")
+    print("pip install -r ./requirements.server.txt")
+    sys.exit(1)
+
 
 setup(
     name="LNT",
@@ -132,7 +114,28 @@
             'lnt = lnt.lnttool:main',
         ],
     },
-    install_requires=reqs,
+    install_requires=[
+        "six",
+        "aniso8601==1.2.0",
+        "Flask==0.12.2",
+        "Flask-RESTful==0.3.4",
+        "Jinja2==2.7.2",
+        "MarkupSafe==0.23",
+        "SQLAlchemy==1.1.11",
+        "Werkzeug==0.12.2",
+        "itsdangerous==0.24",
+        "python-dateutil==2.6.0",
+        "python-gnupg==0.3.7",
+        "pytz==2016.10",
+        "WTForms==2.0.2",
+        "Flask-WTF==0.12",
+        "typing",
+        "click==6.7",
+        "pyyaml==3.13",
+        "requests",
+        "future",
+        "lit",
+    ],
 
     ext_modules=[cPerf],
 

tox.ini

@@ -18,8 +18,6 @@ envlist = py27
 [testenv]
 whitelist_externals = rm
 
-deps = -rrequirements.txt
-
 commands =
     rm -rf ./test_run_tmp
     lit -sv ./tests/