Skip to content

Commit ae91800

Browse files
authored
Ensure fresh Python 2.7 on Trusty and compatible Intervaltree (#2645)
Recent failures of the Mbed OS target came from two independent issues: - some python packages started requiring Python>=2.7.10, and - the latest Intervaltree 3.0.0 release was released broken. This patch ensures a fresh python by 'lying' to the CI that this is a Python project (Python images on the CI come with a recent interpreter, not with the one shipped as default with the OS), and locks Intervaltree to a stable version. JerryScript-DCO-1.0-Signed-off-by: Akos Kiss [email protected]
1 parent a1595fa commit ae91800

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ matrix:
135135
sources:
136136
- sourceline: ppa:team-gcc-arm-embedded/ppa
137137
packages: [gcc-arm-embedded]
138+
language: python # NOTE: only way to ensure python>=2.7.10 on Trusty image
139+
python: 2.7
138140
install: make -f ./targets/mbedos5/Makefile.travis install
139141
script: make -f ./targets/mbedos5/Makefile.travis script
140142

targets/mbedos5/Makefile.travis

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ all:
2323

2424
# Deploy Mbed and install Mbed Python dependencies.
2525
install:
26-
pip install --user mbed-cli
26+
pip install mbed-cli
2727
cd targets/mbedos5 && mbed deploy
28-
pip install --user mbed-host-tests==1.4.2 # FIXME: mbed-host-tests 1.4.4 requires pyocd>=0.14.0, which cannot be satisfied for whatever reason
29-
pip install --user -r targets/mbedos5/mbed-os/requirements.txt
28+
pip install intervaltree==2.1.0 # FIXME: workaround until chaimleib/intervaltree#77 is fixed
29+
pip install -r targets/mbedos5/mbed-os/requirements.txt
3030

3131

3232
## Targets for building Mbed OS 5 with JerryScript.
3333

3434
# Build the firmware (Mbed OS 5 with JerryScript).
3535
script:
36-
pip install --user -r targets/mbedos5/tools/requirements.txt
36+
pip install -r targets/mbedos5/tools/requirements.txt
3737
# HACK: `EXTRA_SRC[_MOD]` are abused to pass `--library` to `mbed compile` in the `all` make target that builds an app
3838
# HACK: this is needed because the Mbed OS 5 target code does not contain any `main` function, so the `all` make target does not link
3939
# HACK: but the `library` make target does not build either because the launcher sources require `jerry-targetjs.h` that are explicitly not generated for libraries

0 commit comments

Comments
 (0)