Skip to content

Commit 1568be0

Browse files
authored
Merge pull request #9389 from cmonr/fixed-travisCI-python-modules
Travis CI: Bind remaining python modules
2 parents a09b5f5 + fde0321 commit 1568be0

File tree

3 files changed

+26
-14
lines changed

3 files changed

+26
-14
lines changed

.travis.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ matrix:
8585
- doxygen doxyfile_options 2>&1
8686
# Once Mbed OS has been fixed, enable the full test by replacing the top line with this:
8787
# - ( ! doxygen doxyfile_options 2>&1 | grep . )
88-
8988
# Assert that all binary libraries are named correctly
9089
# The strange command below asserts that there are exactly 0 libraries
9190
# that do not start with lib
@@ -106,12 +105,20 @@ matrix:
106105
install:
107106
# Install dependencies
108107
- sudo apt-get install gcc-arm-embedded
109-
- pip install -r requirements.txt
110-
- pip install pytest pylint hypothesis==3.88.3 mock coverage coveralls
111-
# Print versions we use
112-
113108
- arm-none-eabi-gcc --version
109+
# Add additional dependencies specific for testing
114110
- python --version
111+
- |-
112+
tr -d ' ' >> requirements.txt <<< "
113+
mock==2.0.0
114+
pytest==3.3.0
115+
pylint>=1.9,<2
116+
hypothesis>=3,<4
117+
coverage>=4.5,<5
118+
coveralls>=1.5,<2
119+
"
120+
# ... and install.
121+
- pip install -r requirements.txt
115122
- pip list --verbose
116123
script:
117124
# Run local testing on tools

requirements.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
colorama==0.3.9
2-
pyserial>=3,<=3.4
2+
urllib3[secure]==1.23
33
prettytable==0.7.2
4-
Jinja2>=2.7.3,<=2.10
5-
intelhex>=1.3,<=2.2.1
64
junit-xml==1.8
75
pyyaml==4.2b1
8-
urllib3[secure]==1.23
6+
jsonschema==2.6.0
7+
future==0.16.0
8+
six==1.11.0
9+
mbed-cloud-sdk==2.0.1
910
requests>=2.20,<2.21
11+
idna>=2,<2.8
12+
pyserial>=3,<=3.4
13+
Jinja2>=2.7.3,<=2.10
14+
intelhex>=1.3,<=2.2.1
1015
intervaltree>=2,<3
1116
mbed-ls>=1.5.1,<1.7
1217
mbed-host-tests>=1.1.2,<=1.5
1318
mbed-greentea>=0.2.24,<=1.5
1419
beautifulsoup4>=4,<=4.6.3
1520
fuzzywuzzy>=0.11,<=0.17
1621
pyelftools>=0.24,<=0.25
17-
jsonschema==2.6.0
18-
future==0.16.0
19-
six==1.11.0
2022
git+https://github.com/armmbed/[email protected]
21-
mbed-cloud-sdk==2.0.1
2223
pyocd>=0.14,<0.15
2324
icetea>=1.0.2,<1.1

tools/test/toolchains/api_test.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from string import printable
55
from copy import deepcopy
66
from mock import MagicMock, patch
7-
from hypothesis import given, settings
7+
from hypothesis import given, settings, HealthCheck
88
from hypothesis.strategies import text, lists, fixed_dictionaries, booleans
99

1010
ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..",
@@ -112,6 +112,7 @@ def test_gcc_version_check(_run_cmd):
112112
'asm': lists(text()),
113113
'ld': lists(text())}),
114114
lists(text(min_size=1, alphabet=ALPHABET), min_size=1))
115+
@settings(suppress_health_check=[HealthCheck.too_slow])
115116
def test_toolchain_profile_c(profile, source_file):
116117
"""Test that the appropriate profile parameters are passed to the
117118
C compiler"""
@@ -144,6 +145,7 @@ def test_toolchain_profile_c(profile, source_file):
144145
'asm': lists(text()),
145146
'ld': lists(text())}),
146147
lists(text(min_size=1, alphabet=ALPHABET), min_size=1))
148+
@settings(suppress_health_check=[HealthCheck.too_slow])
147149
def test_toolchain_profile_cpp(profile, source_file):
148150
"""Test that the appropriate profile parameters are passed to the
149151
C++ compiler"""
@@ -175,6 +177,7 @@ def test_toolchain_profile_cpp(profile, source_file):
175177
'asm': lists(text()),
176178
'ld': lists(text())}),
177179
lists(text(min_size=1, alphabet=ALPHABET), min_size=1))
180+
@settings(suppress_health_check=[HealthCheck.too_slow])
178181
def test_toolchain_profile_asm(profile, source_file):
179182
"""Test that the appropriate profile parameters are passed to the
180183
Assembler"""
@@ -213,6 +216,7 @@ def test_toolchain_profile_asm(profile, source_file):
213216
'asm': lists(text()),
214217
'ld': lists(text(min_size=1))}),
215218
lists(text(min_size=1, alphabet=ALPHABET), min_size=1))
219+
@settings(suppress_health_check=[HealthCheck.too_slow])
216220
def test_toolchain_profile_ld(profile, source_file):
217221
"""Test that the appropriate profile parameters are passed to the
218222
Linker"""

0 commit comments

Comments
 (0)