Move development reqirements to dev-requirements.txt

In some cases, such as when working inside a virtual environment, it can
be desirable to install all dependencies for running tests using `pip`.
This is currently not possible since setuptools does not support
installing these dependencies in a virtual environment (by design).
(See https://stackoverflow.com/a/21003259.)

To circumvent this issue, move such requirements to
`dev-requirements.txt` file that can be used easily with
`pip install -r`. This also enables tests to be run directly using
`pytest`, which can be more convenient than `-addopts` approach when one
needs to add multiple options.

This will also be useful in creating better testuite images, and fix
some of the issues noticed in
https://gitlab.com/BuildStream/buildstream-docker-images/merge_requests/56.

3 files changed, 26 insertions, 13 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 3c8cc64b4..80c815e55 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -21,3 +21,6 @@ recursive-include tests *.expected
 
 # Protocol Buffers
 recursive-include buildstream/_protos *.proto
+
+# Requirements files
+dev-requirements.txt
diff --git a/dev-requirements.txt b/dev-requirements.txt
new file mode 100644
index 000000000..8b4834fa5
--- /dev/null
+++ b/dev-requirements.txt
@@ -0,0 +1,12 @@
+# Pin coverage to 4.2 for now, were experiencing
+# random crashes with 4.4.2
+coverage == 4.4.0
+pep8
+pytest >= 3.1.0
+pytest-cov >= 2.5.0
+pytest-datafiles
+pytest-env
+pytest-pep8
+pytest-pylint
+# Provide option to run tests in parallel, less reliable
+pytest-xdist
diff --git a/setup.py b/setup.py
index fec33047d..700d9df96 100755
--- a/setup.py
+++ b/setup.py
@@ -219,6 +219,15 @@ def get_cmdclass():
 
 
 #####################################################
+#               Gather requirements                 #
+#####################################################
+setup_requires = set(['pytest-runner'])
+with open('dev-requirements.txt') as dev_reqs:
+    dev_requires = set([line for line in dev_reqs.read().split('\n')
+                        if not line.strip().startswith('#')])
+
+
+#####################################################
 #             Main setup() Invocation               #
 #####################################################
 setup(name='BuildStream',
@@ -260,17 +269,6 @@ setup(name='BuildStream',
           'grpcio >= 1.10',
       ],
       entry_points=bst_install_entry_points,
-      setup_requires=['pytest-runner'],
-      tests_require=['pep8',
-                     # Pin coverage to 4.2 for now, we're experiencing
-                     # random crashes with 4.4.2
-                     'coverage == 4.4.0',
-                     'pytest-datafiles',
-                     'pytest-env',
-                     'pytest-pep8',
-                     'pytest-pylint',
-                     'pytest-cov >= 2.5.0',
-                     # Provide option to run tests in parallel, less reliable
-                     'pytest-xdist',
-                     'pytest >= 3.1.0'],
+      setup_requires=list(setup_requires),
+      tests_require=list(dev_requires - setup_requires),
       zip_safe=False)