diff options
author | Javier Jardón <jjardon@gnome.org> | 2018-08-12 01:37:18 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2018-08-12 01:37:18 +0000 |
commit | ba58532d9207a38e9c80e2593928de04143293d3 (patch) | |
tree | 7973f01cba51bf8d415cadeb83094b10844630f6 | |
parent | 7bc4a8174fee5f80b4efbae7b0e4c503620c15a2 (diff) | |
parent | f03df3ce0fc5fe7b2af720a6b427d7182ef0065c (diff) | |
download | buildstream-ba58532d9207a38e9c80e2593928de04143293d3.tar.gz |
Merge branch 'chandan/dev-reqs-1.2' into 'bst-1.2'
Move development reqirements to dev-requirements.txt
See merge request BuildStream/buildstream!642
-rw-r--r-- | MANIFEST.in | 3 | ||||
-rw-r--r-- | dev-requirements.txt | 13 | ||||
-rwxr-xr-x | setup.py | 25 |
3 files changed, 27 insertions, 14 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..8cf1851f4 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,13 @@ +# Pin coverage to 4.2 for now, we're experiencing +# random crashes with 4.4.2 +coverage == 4.4.0 +pep8 +pylint >= 1.8 , < 2 +pytest >= 3.1.0 +pytest-cov +pytest-datafiles +pytest-env +pytest-pep8 +pytest-pylint +# Provide option to run tests in parallel, less reliable +pytest-xdist @@ -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,18 +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', - # Provide option to run tests in parallel, less reliable - 'pytest-xdist', - 'pytest >= 3.1.0', - 'pylint >= 1.8 , < 2'], + setup_requires=list(setup_requires), + tests_require=list(dev_requires - setup_requires), zip_safe=False) |