@@ -106,12 +106,16 @@ function ci_code_size_build {
106106# .mpy file format
107107
108108function ci_mpy_format_setup {
109+ sudo apt-get update
110+ sudo apt-get install python2.7
109111 sudo pip3 install pyelftools
112+ python2.7 --version
113+ python3 --version
110114}
111115
112116function ci_mpy_format_test {
113117 # 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
115119 python3 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
116120
117121 # Test mpy-tool.py dump feature on native code
@@ -268,18 +272,18 @@ function ci_powerpc_build {
268272# ports/qemu
269273
270274function ci_qemu_setup_arm {
271- ci_mpy_format_setup
272275 ci_gcc_arm_setup
273276 sudo apt-get update
274277 sudo apt-get install qemu-system
278+ sudo pip3 install pyelftools
275279 qemu-system-arm --version
276280}
277281
278282function ci_qemu_setup_rv32 {
279- ci_mpy_format_setup
280283 ci_gcc_riscv_setup
281284 sudo apt-get update
282285 sudo apt-get install qemu-system
286+ sudo pip3 install pyelftools
283287 qemu-system-riscv32 --version
284288}
285289
@@ -580,10 +584,11 @@ function ci_unix_coverage_run_native_mpy_tests {
580584function ci_unix_32bit_setup {
581585 sudo dpkg --add-architecture i386
582586 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
584588 sudo pip3 install setuptools
585589 sudo pip3 install pyelftools
586590 gcc --version
591+ python2.7 --version
587592 python3 --version
588593}
589594
@@ -602,12 +607,12 @@ function ci_unix_coverage_32bit_run_native_mpy_tests {
602607
603608function ci_unix_nanbox_build {
604609 # 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"
606611 ci_unix_build_ffi_lib_helper gcc -m32
607612}
608613
609614function 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
611616}
612617
613618function ci_unix_float_build {
0 commit comments