@@ -106,12 +106,16 @@ function ci_code_size_build {
106
106
# .mpy file format
107
107
108
108
function ci_mpy_format_setup {
109
+ sudo apt-get update
110
+ sudo apt-get install python2.7
109
111
sudo pip3 install pyelftools
112
+ python2.7 --version
113
+ python3 --version
110
114
}
111
115
112
116
function ci_mpy_format_test {
113
117
# Test mpy-tool.py dump feature on bytecode
114
- python2 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
118
+ python2.7 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
115
119
python3 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
116
120
117
121
# Test mpy-tool.py dump feature on native code
@@ -268,18 +272,18 @@ function ci_powerpc_build {
268
272
# ports/qemu
269
273
270
274
function ci_qemu_setup_arm {
271
- ci_mpy_format_setup
272
275
ci_gcc_arm_setup
273
276
sudo apt-get update
274
277
sudo apt-get install qemu-system
278
+ sudo pip3 install pyelftools
275
279
qemu-system-arm --version
276
280
}
277
281
278
282
function ci_qemu_setup_rv32 {
279
- ci_mpy_format_setup
280
283
ci_gcc_riscv_setup
281
284
sudo apt-get update
282
285
sudo apt-get install qemu-system
286
+ sudo pip3 install pyelftools
283
287
qemu-system-riscv32 --version
284
288
}
285
289
@@ -580,10 +584,11 @@ function ci_unix_coverage_run_native_mpy_tests {
580
584
function ci_unix_32bit_setup {
581
585
sudo dpkg --add-architecture i386
582
586
sudo apt-get update
583
- sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386
587
+ sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386 python2.7
584
588
sudo pip3 install setuptools
585
589
sudo pip3 install pyelftools
586
590
gcc --version
591
+ python2.7 --version
587
592
python3 --version
588
593
}
589
594
@@ -602,12 +607,12 @@ function ci_unix_coverage_32bit_run_native_mpy_tests {
602
607
603
608
function ci_unix_nanbox_build {
604
609
# Use Python 2 to check that it can run the build scripts
605
- ci_unix_build_helper PYTHON=python2 VARIANT=nanbox CFLAGS_EXTRA=" -DMICROPY_PY_MATH_CONSTANTS=1"
610
+ ci_unix_build_helper PYTHON=python2.7 VARIANT=nanbox CFLAGS_EXTRA=" -DMICROPY_PY_MATH_CONSTANTS=1"
606
611
ci_unix_build_ffi_lib_helper gcc -m32
607
612
}
608
613
609
614
function ci_unix_nanbox_run_tests {
610
- ci_unix_run_tests_full_helper nanbox PYTHON=python2
615
+ ci_unix_run_tests_full_helper nanbox PYTHON=python2.7
611
616
}
612
617
613
618
function ci_unix_float_build {
0 commit comments