summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-requirements.txt3
-rwxr-xr-xsetup.py8
2 files changed, 3 insertions, 8 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index d3d4ab64a..81429f0ef 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,5 +1,3 @@
-# Pin coverage to 4.2 for now, we're experiencing
-# random crashes with 4.4.2
coverage == 4.4.0
pep8
pytest >= 3.1.0
@@ -8,5 +6,4 @@ 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 700d9df96..35b8245c9 100755
--- a/setup.py
+++ b/setup.py
@@ -221,10 +221,8 @@ 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('#')])
+ dev_requires = dev_reqs.read().splitlines()
#####################################################
@@ -269,6 +267,6 @@ setup(name='BuildStream',
'grpcio >= 1.10',
],
entry_points=bst_install_entry_points,
- setup_requires=list(setup_requires),
- tests_require=list(dev_requires - setup_requires),
+ setup_requires=['pytest-runner'],
+ tests_require=dev_requires,
zip_safe=False)