summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2018-08-11 16:53:39 +0000
committerJavier Jardón <jjardon@gnome.org>2018-08-11 16:53:39 +0000
commita9f63c5e8143a9d29c4691463d25aacbad3b40b5 (patch)
tree6dc784c7b98e79e98a79b2e5fd017099e4da3a04
parent2e8db54ea7b0b324f6daa47bc031a146a3eee9fa (diff)
parent95920f48df826dea75e137f00a0abd2ea1d72775 (diff)
downloadbuildstream-a9f63c5e8143a9d29c4691463d25aacbad3b40b5.tar.gz
Merge branch 'chandan/dev-requirements' into 'master'
Move development reqirements to dev-requirements.txt See merge request BuildStream/buildstream!637
-rw-r--r--MANIFEST.in3
-rw-r--r--dev-requirements.txt12
-rwxr-xr-xsetup.py24
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)