Javier Jardón pushed to branch master at BuildStream / buildstream
Commits:
-
60c2873b
by Javier Jardón at 2018-08-12T01:38:29Z
-
2f27d428
by Javier Jardón at 2018-08-12T01:38:29Z
-
1819a288
by Javier Jardón at 2018-08-12T03:37:04Z
-
48c715e3
by Javier Jardón at 2018-08-12T04:42:45Z
3 changed files:
Changes:
1 |
-image: buildstream/testsuite-debian:9-master-102-9067e269
|
|
1 |
+image: buildstream/testsuite-debian:9-master-112-a9f63c5e
|
|
2 | 2 |
|
3 | 3 |
cache:
|
4 | 4 |
key: "$CI_JOB_NAME-"
|
... | ... | @@ -79,11 +79,15 @@ source_dist: |
79 | 79 |
- coverage-linux/
|
80 | 80 |
|
81 | 81 |
tests-debian-9:
|
82 |
- image: buildstream/testsuite-debian:9-master-102-9067e269
|
|
82 |
+ image: buildstream/testsuite-debian:9-master-112-a9f63c5e
|
|
83 | 83 |
<<: *linux-tests
|
84 | 84 |
|
85 | 85 |
tests-fedora-27:
|
86 |
- image: buildstream/testsuite-fedora:27-master-102-9067e269
|
|
86 |
+ image: buildstream/testsuite-fedora:27-master-112-a9f63c5e
|
|
87 |
+ <<: *linux-tests
|
|
88 |
+ |
|
89 |
+tests-fedora-28:
|
|
90 |
+ image: buildstream/testsuite-fedora:28-master-112-a9f63c5e
|
|
87 | 91 |
<<: *linux-tests
|
88 | 92 |
|
89 | 93 |
tests-ubuntu-18.04:
|
... | ... | @@ -93,7 +97,7 @@ tests-ubuntu-18.04: |
93 | 97 |
tests-unix:
|
94 | 98 |
# Use fedora here, to a) run a test on fedora and b) ensure that we
|
95 | 99 |
# can get rid of ostree - this is not possible with debian-8
|
96 |
- image: buildstream/testsuite-fedora:27-master-102-9067e269
|
|
100 |
+ image: buildstream/testsuite-fedora:27-master-112-a9f63c5e
|
|
97 | 101 |
stage: test
|
98 | 102 |
variables:
|
99 | 103 |
BST_FORCE_BACKEND: "unix"
|
... | ... | @@ -214,6 +218,7 @@ coverage: |
214 | 218 |
dependencies:
|
215 | 219 |
- tests-debian-9
|
216 | 220 |
- tests-fedora-27
|
221 |
+ - tests-fedora-28
|
|
217 | 222 |
- tests-unix
|
218 | 223 |
- source_dist
|
219 | 224 |
|
1 |
-# Pin coverage to 4.2 for now, we're experiencing
|
|
2 |
-# random crashes with 4.4.2
|
|
3 | 1 |
coverage == 4.4.0
|
4 | 2 |
pep8
|
5 | 3 |
pytest >= 3.1.0
|
... | ... | @@ -8,5 +6,4 @@ pytest-datafiles |
8 | 6 |
pytest-env
|
9 | 7 |
pytest-pep8
|
10 | 8 |
pytest-pylint
|
11 |
-# Provide option to run tests in parallel, less reliable
|
|
12 | 9 |
pytest-xdist
|
... | ... | @@ -221,10 +221,8 @@ def get_cmdclass(): |
221 | 221 |
#####################################################
|
222 | 222 |
# Gather requirements #
|
223 | 223 |
#####################################################
|
224 |
-setup_requires = set(['pytest-runner'])
|
|
225 | 224 |
with open('dev-requirements.txt') as dev_reqs:
|
226 |
- dev_requires = set([line for line in dev_reqs.read().split('\n')
|
|
227 |
- if not line.strip().startswith('#')])
|
|
225 |
+ dev_requires = dev_reqs.read().splitlines()
|
|
228 | 226 |
|
229 | 227 |
|
230 | 228 |
#####################################################
|
... | ... | @@ -269,6 +267,6 @@ setup(name='BuildStream', |
269 | 267 |
'grpcio >= 1.10',
|
270 | 268 |
],
|
271 | 269 |
entry_points=bst_install_entry_points,
|
272 |
- setup_requires=list(setup_requires),
|
|
273 |
- tests_require=list(dev_requires - setup_requires),
|
|
270 |
+ setup_requires=['pytest-runner'],
|
|
271 |
+ tests_require=dev_requires,
|
|
274 | 272 |
zip_safe=False)
|