Skip to content

Commit 420643d

Browse files
Roland Takacsrerobika
authored andcommitted
Use Python 3.6 in case of Zephyr target (#3493)
PyYAML requires Python 2.7 or Python 3.4+. JerryScript-DCO-1.0-Signed-off-by: Roland Takacs r.takacs2@partner.samsung.com
1 parent 9e0709e commit 420643d

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,13 @@ matrix:
120120
script: make -f ./targets/mbedos5/Makefile.travis script
121121

122122
- name: "Zephyr/Arduino 101 Build Test"
123+
language: python # NOTE: only way to ensure python>=2.7.10 on Trusty image
124+
python: 3.6
123125
install: make -f ./targets/zephyr/Makefile.travis install-noapt
124126
script: make -f ./targets/zephyr/Makefile.travis script
125127
addons:
126128
apt:
127-
packages: [gperf, dfu-util, device-tree-compiler, python3-ply, python3-pip]
129+
packages: [gperf, dfu-util, device-tree-compiler]
128130

129131
- name: "NuttX/STM32F4 Build Test"
130132
install: make -f targets/nuttx-stm32f4/Makefile.travis install-noapt

targets/zephyr/Makefile.travis

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

2424
# Install tools via apt.
2525
install-apt-get-deps:
26-
sudo apt-get install -q -y gperf dfu-util device-tree-compiler python3-ply python3-pip
26+
sudo apt-get install -q -y gperf dfu-util device-tree-compiler
2727

2828
# Install Zephyr SDK.
2929
install-zephyr-sdk:
@@ -33,13 +33,13 @@ install-zephyr-sdk:
3333
# Fetch Zephyr Project repository and install python dependencies.
3434
install-zephyr:
3535
git clone https://github.com/zephyrproject-rtos/zephyr.git ../zephyr -b v1.14-branch
36-
pip3 install --user -U pip
37-
pip3 install --user -U setuptools
38-
pip3 install --user -r ../zephyr/scripts/requirements.txt
36+
pip3 install -U pip
37+
pip3 install -U setuptools
38+
pip3 install -r ../zephyr/scripts/requirements.txt
3939

4040
# Install recent CMake
4141
install-cmake:
42-
pip install --user cmake
42+
pip install cmake
4343
cmake --version
4444

4545
# Perform all the necessary (JerryScript-independent) installation steps.

0 commit comments

Comments
 (0)