Skip to content

Commit 3af1c75

Browse files
author
Jamie Smith
authored
Bring python packages into the mbed-os source (#192)
* Initial import of python packages * Move tests to subfolder, use tests in generate_configuration.cmake * Bring python packages into the source tree instead of needing to be installed separately * Use python3 * Just use distro default python * Install all the requirements with apt-get * unittests is part of Python now * Add appdirs, set python version * Add some missing dependencies * Add more packages * Add requirements.apt.txt files, fix relative paths with scancode_evaluate.py * Fix return code handling for license scan errors * ok let's try that again, also improve error output from scancode evaluate * Add missing license headers
1 parent e1a1542 commit 3af1c75

File tree

440 files changed

+46246
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

440 files changed

+46246
-83
lines changed

.github/workflows/basic_checks.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ jobs:
2525
-
2626
name: install dependencies
2727
shell: bash
28+
# TODO scancode 32.0 introduced significant breaking changes to the license
29+
# detection output format: https://github.com/nexB/scancode-toolkit/releases/tag/v32.0.0
30+
# Need to update Mbed's scripts for the new format.
2831
run: |
29-
pip install -U scancode-toolkit "click>=7,<8"
32+
pip install -U "scancode-toolkit<32.0" "click>=7,<8"
3033
3134
-
3235
name: license check
@@ -43,10 +46,14 @@ jobs:
4346
| while read file; do cp --parents "${file}" SCANCODE; done
4447
ls SCANCODE
4548
scancode -l --json-pp scancode.json SCANCODE
46-
python ./tools/test/ci/scancode-evaluate.py scancode.json || true
47-
cat scancode-evaluate.log
48-
COUNT=$(cat scancode-evaluate.log | grep 'File:' | grep -v 'SPDX' | wc -l) || true
49-
if [ $COUNT = 0 ]; then
49+
cd tools/python
50+
51+
# Run the evaluation script, which may fail, and save its exit code.
52+
EVALUATE_EXITCODE=0
53+
python -m scancode_evaluate.scancode_evaluate ../../scancode.json || EVALUATE_EXITCODE=$?
54+
55+
cat scancode_evaluate.log
56+
if [ "$EVALUATE_EXITCODE" = 0 ]; then
5057
echo "License check OK";
5158
true;
5259
else
@@ -158,25 +165,18 @@ jobs:
158165
name: Checkout repo
159166
uses: actions/checkout@v3
160167

161-
162-
- uses: actions/setup-python@v2
163-
with:
164-
python-version: '3.7'
165-
166168
-
167169
name: install dependencies
168170
run: |
169-
pip install -r tools/requirements.txt
170-
pip install -r tools/test/requirements.txt
171+
xargs sudo apt-get install -y < tools/requirements.apt.txt
172+
xargs sudo apt-get install -y < tools/python/python_tests/requirements.apt.txt
171173
172174
-
173-
name: pytest
175+
name: Python Tests
174176
run: |
175-
set -x
176-
coverage run -a -m pytest tools/test
177-
python tools/test/pylint.py
178-
coverage run -a tools/project.py -S | sed -n '/^Total/p'
179-
coverage html
177+
cd tools/python
178+
./run_python_tests.sh
179+
180180
181181
pin-validation:
182182
runs-on: ubuntu-latest

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ venv/
3131
*.egg
3232
*.egg-info
3333
dist
34-
build
34+
/build
3535
eggs
3636
parts
3737
bin

tools/cmake/app.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
1515
include(CheckPythonPackage)
1616

1717
# Check python packages
18-
set(PYTHON_PACKAGES_TO_CHECK intelhex prettytable future jinja2 mbed_tools)
18+
set(PYTHON_PACKAGES_TO_CHECK intelhex prettytable future jinja2)
1919
foreach(PACKAGE_NAME ${PYTHON_PACKAGES_TO_CHECK})
2020
string(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UCASE) # Ucase name needed for CMake variable
2121
string(TOLOWER ${PACKAGE_NAME} PACKAGE_NAME_LCASE) # Lcase name needed for import statement

tools/cmake/mbed-run-greentea-test.in.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ message("Executing: mbedhtrun ${MBEDHTRUN_ARGS_FOR_DISPLAY}")
1818

1919
# Note: For this command, we need to survive mbedhtrun not being on the PATH, so we import the package and call the main function using "python -c"
2020
execute_process(
21-
COMMAND @Python3_EXECUTABLE@ -c "import mbed_host_tests.mbedhtrun; exit(mbed_host_tests.mbedhtrun.main())" ${MBEDHTRUN_ARGS}
22-
WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@"
21+
COMMAND @Python3_EXECUTABLE@ -m mbed_host_tests.mbedhtrun ${MBEDHTRUN_ARGS}
22+
WORKING_DIRECTORY "@mbed-os_SOURCE_DIR@/tools/python"
2323
COMMAND_ERROR_IS_FATAL ANY)

tools/cmake/mbed_generate_configuration.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ if(MBED_NEED_TO_RECONFIGURE)
103103

104104
execute_process(
105105
COMMAND ${MBEDTOOLS_CONFIGURE_COMMAND}
106-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
106+
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../python
107107
RESULT_VARIABLE MBEDTOOLS_CONFIGURE_RESULT
108108
OUTPUT_VARIABLE MBEDTOOLS_CONFIGURE_OUTPUT
109109
ERROR_VARIABLE MBEDTOOLS_CONFIGURE_ERROR_OUTPUT

tools/cmake/mbed_target_functions.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ function(mbed_generate_map_file target)
5353
TARGET
5454
${target}
5555
POST_BUILD
56-
COMMAND ${Python3_EXECUTABLE} ${mbed-os_SOURCE_DIR}/tools/memap.py
56+
COMMAND ${Python3_EXECUTABLE} -m memap.memap
5757
-t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
5858
--depth ${MBED_MEMAP_DEPTH}
5959
WORKING_DIRECTORY
60-
${CMAKE_CURRENT_BINARY_DIR}
60+
${mbed-os_SOURCE_DIR}/tools/python
6161
)
6262

6363
# generate json file
@@ -66,13 +66,13 @@ function(mbed_generate_map_file target)
6666
TARGET
6767
${target}
6868
POST_BUILD
69-
COMMAND ${Python3_EXECUTABLE} ${mbed-os_SOURCE_DIR}/tools/memap.py
69+
COMMAND ${Python3_EXECUTABLE} -m memap.memap
7070
-t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
7171
--depth ${MBED_MEMAP_DEPTH}
7272
-e json
7373
-o ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.memmap.json
7474
WORKING_DIRECTORY
75-
${CMAKE_CURRENT_BINARY_DIR}
75+
${mbed-os_SOURCE_DIR}/tools/python
7676
)
7777
endif()
7878

@@ -82,13 +82,13 @@ function(mbed_generate_map_file target)
8282
TARGET
8383
${target}
8484
POST_BUILD
85-
COMMAND ${Python3_EXECUTABLE} ${mbed-os_SOURCE_DIR}/tools/memap.py
85+
COMMAND ${Python3_EXECUTABLE} -m memap.memap
8686
-t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
8787
--depth ${MBED_MEMAP_DEPTH}
8888
-e html
8989
-o ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.memmap.html
9090
WORKING_DIRECTORY
91-
${CMAKE_CURRENT_BINARY_DIR}
91+
${mbed-os_SOURCE_DIR}/tools/python
9292
)
9393
endif()
9494
endfunction()

tools/cmake/upload_methods/UploadMethodMBED.cmake

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
set(UPLOAD_SUPPORTS_DEBUG FALSE)
88

99
### Check if upload method can be enabled on this machine
10-
check_python_package(mbed_os_tools HAVE_MBED_OS_TOOLS)
11-
set(UPLOAD_MBED_FOUND ${HAVE_MBED_OS_TOOLS})
10+
set(UPLOAD_MBED_FOUND ${Python3_FOUND})
1211

1312
if(NOT DEFINED MBED_RESET_BAUDRATE)
1413
set(MBED_RESET_BAUDRATE 9600)
@@ -20,11 +19,14 @@ set(MBED_TARGET_UID "" CACHE STRING "UID of mbed target to upload to if there ar
2019
function(gen_upload_target TARGET_NAME BIN_FILE)
2120

2221
add_custom_target(flash-${TARGET_NAME}
23-
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/install_bin_file.py
24-
${BIN_FILE}
25-
${MBED_TARGET}
26-
${MBED_RESET_BAUDRATE}
27-
${MBED_TARGET_UID})
22+
COMMAND ${Python3_EXECUTABLE} -m install_bin_file
23+
${BIN_FILE}
24+
${MBED_TARGET}
25+
${MBED_RESET_BAUDRATE}
26+
${MBED_TARGET_UID}
27+
WORKING_DIRECTORY
28+
${mbed-os_SOURCE_DIR}/tools/python
29+
VERBATIM)
2830

2931
add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
3032

tools/python/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Python coverage database
2+
.coverage
3+
4+
# Coverage report
5+
htmlcov/

tools/python/LICENSE

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.

tools/python/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#
2+
# Copyright (c) 2020-2023 Arm Limited and Contributors. All rights reserved.
3+
# SPDX-License-Identifier: Apache-2.0
4+
#

0 commit comments

Comments
 (0)