Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct Python 3 errors and lint warnings in build_release.py #10257

Merged
merged 3 commits into from Apr 12, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -1,4 +1,3 @@
#! /usr/bin/env python
"""
mbed SDK
Copyright (c) 2011-2013 ARM Limited
@@ -21,109 +20,137 @@
from optparse import OptionParser
import json
from shutil import copy
from past.builtins import basestring
from past.builtins import str
This conversation was marked as resolved by theotherjimmy

This comment has been minimized.

Copy link
@bridadan

bridadan Apr 5, 2019

Contributor

I believe we should revert this line.

Suggested change
from past.builtins import str
from past.builtins import basestring

# Be sure that the tools directory is in the search path
ROOT = abspath(join(dirname(__file__), ".."))
sys.path.insert(0, ROOT)

from tools.build_api import build_mbed_libs
from tools.build_api import write_build_report
from tools.build_api import get_mbed_official_release
from tools.options import extract_profile
from tools.targets import TARGET_MAP, TARGET_NAMES
from tools.test_exporters import ReportExporter, ResultExporterType
from tools.test_api import SingleTestRunner
from tools.test_api import singletest_in_cli_mode
from tools.paths import TEST_DIR, MBED_LIBRARIES
from tools.tests import TEST_MAP
from tools.notifier.term import TerminalNotifier
from tools.build_api import build_mbed_libs # noqa: E402
from tools.build_api import get_mbed_official_release # noqa: E402
from tools.options import extract_profile # noqa: E402
from tools.targets import TARGET_MAP, TARGET_NAMES # noqa: E402
from tools.test_exporters import ReportExporter, ResultExporterType # noqa: E402, E501
from tools.test_api import SingleTestRunner # noqa: E402
from tools.paths import TEST_DIR, MBED_LIBRARIES # noqa: E402
from tools.tests import TEST_MAP # noqa: E402
from tools.notifier.term import TerminalNotifier # noqa: E402

OFFICIAL_MBED_LIBRARY_BUILD = get_mbed_official_release('2')

if __name__ == '__main__':
parser = OptionParser()
parser.add_option('-o', '--official', dest="official_only", default=False, action="store_true",
help="Build using only the official toolchain for each target")
parser.add_option("-j", "--jobs", type="int", dest="jobs",
default=1, help="Number of concurrent jobs (default 1). Use 0 for auto based on host machine's number of CPUs")
parser.add_option("-v", "--verbose", action="store_true", dest="verbose",
default=False, help="Verbose diagnostic output")
parser.add_option("-t", "--toolchains", dest="toolchains", help="Use toolchains names separated by comma")

parser.add_option(
'-o', '--official',
dest="official_only",
default=False,
action="store_true",
help="Build using only the official toolchain for each target"
)
parser.add_option(
"-j", "--jobs",
type="int",
dest="jobs",
default=1,
help="Number of concurrent jobs (default 1)."
" Use 0 for auto based on host machine's number of CPUs"
)
parser.add_option(
"-v", "--verbose",
action="store_true",
dest="verbose",
default=False,
help="Verbose diagnostic output"
)
parser.add_option(
"-t", "--toolchains",
dest="toolchains",
help="Use toolchains names separated by comma"
)
parser.add_option("--profile", dest="profile", action="append", default=[])

parser.add_option("-p", "--platforms", dest="platforms", default="", help="Build only for the platform namesseparated by comma")

parser.add_option("-L", "--list-config", action="store_true", dest="list_config",
default=False, help="List the platforms and toolchains in the release in JSON")

parser.add_option("", "--report-build", dest="report_build_file_name", help="Output the build results to an junit xml file")

parser.add_option("", "--build-tests", dest="build_tests", help="Build all tests in the given directories (relative to /libraries/tests)")


parser.add_option(
"-p", "--platforms",
dest="platforms",
default="",
help="Build only for the platform namesseparated by comma"
)
parser.add_option(
"-L", "--list-config",
action="store_true",
dest="list_config",
default=False,
help="List the platforms and toolchains in the release in JSON"
)
parser.add_option(
"", "--report-build",
dest="report_build_file_name",
help="Output the build results to an junit xml file"
)
parser.add_option(
"", "--build-tests",
dest="build_tests",
help="Build all tests in the given directories"
" (relative to /libraries/tests)"
)
options, args = parser.parse_args()



if options.list_config:
print json.dumps(OFFICIAL_MBED_LIBRARY_BUILD, indent=4)
print(json.dumps(OFFICIAL_MBED_LIBRARY_BUILD, indent=4))
sys.exit()

start = time()
build_report = {}
build_properties = {}

platforms = None
if options.platforms != "":
platforms = set(options.platforms.split(","))

status = True

if options.build_tests:
# Get all paths
directories = options.build_tests.split(',')
for i in range(len(directories)):
directories[i] = normpath(join(TEST_DIR, directories[i]))

test_names = []

for test_id in TEST_MAP.keys():
for test_id in list(TEST_MAP.keys()):
# Prevents tests with multiple source dirs from being checked
if isinstance( TEST_MAP[test_id].source_dir, basestring):
if isinstance(TEST_MAP[test_id].source_dir, str):
This conversation was marked as resolved by theotherjimmy

This comment has been minimized.

Copy link
@bridadan

bridadan Mar 28, 2019

Contributor

Was this a lint thing? Changing basestring to str?

This comment has been minimized.

Copy link
@theotherjimmy

theotherjimmy Mar 28, 2019

Author Contributor

a 2to3 thing. I'll revert it.

This comment has been minimized.

Copy link
@bridadan

bridadan Apr 5, 2019

Contributor

I believe we should revert this change to basestring

Suggested change
if isinstance(TEST_MAP[test_id].source_dir, str):
if isinstance(TEST_MAP[test_id].source_dir, basestring):
test_path = normpath(TEST_MAP[test_id].source_dir)
for directory in directories:
if directory in test_path:
test_names.append(test_id)

mut_counter = 1
mut = {}
test_spec = {
"targets": {}
}

if options.toolchains:
print "Only building using the following toolchains: %s" % (options.toolchains)
print("Only building using the following toolchains: {}".format(
options.toolchains
))

for target_name, toolchain_list in OFFICIAL_MBED_LIBRARY_BUILD:
toolchains = None
if platforms is not None and not target_name in platforms:
print("Excluding %s from release" % target_name)
if platforms is not None and target_name not in platforms:
print(("Excluding %s from release" % target_name))
This conversation was marked as resolved by theotherjimmy

This comment has been minimized.

Copy link
@bridadan

bridadan Mar 28, 2019

Contributor

Probably don't need double parenthesis 😄. But moving it to the "".format() style would probably be good:

Suggested change
print(("Excluding %s from release" % target_name))
print("Excluding {} from release".format(target_name))

This comment has been minimized.

Copy link
@theotherjimmy

theotherjimmy Mar 28, 2019

Author Contributor

Also a 2to3 thing. I'll take your suggestion.

continue

if target_name not in TARGET_NAMES:
print "Target '%s' is not a valid target. Excluding from release"
print("Target '{}' is not a valid target. Excluding".format(
target_name
))
continue

if options.official_only:
toolchains = (getattr(TARGET_MAP[target_name], 'default_toolchain', 'ARM'),)
toolchains = (getattr(
TARGET_MAP[target_name], 'default_toolchain', 'ARM'
),)
else:
toolchains = toolchain_list

if options.toolchains:
toolchainSet = set(toolchains)
toolchains = toolchainSet.intersection(set((options.toolchains).split(',')))
toolchains = toolchainSet.intersection(
set((options.toolchains).split(','))
)

mut[str(mut_counter)] = {
"mcu": target_name
@@ -133,40 +160,57 @@

test_spec["targets"][target_name] = toolchains

single_test = SingleTestRunner(_muts=mut,
_parser=parser,
_opts=options,
_opts_report_build_file_name=options.report_build_file_name,
_test_spec=test_spec,
_opts_test_by_names=",".join(test_names),
_opts_verbose=options.verbose,
_opts_only_build_tests=True,
_opts_suppress_summary=True,
_opts_jobs=options.jobs,
_opts_include_non_automated=True,
_opts_build_report=build_report,
_opts_build_properties=build_properties)
single_test = SingleTestRunner(
_muts=mut,
_parser=parser,
_opts=options,
_opts_report_build_file_name=options.report_build_file_name,
_test_spec=test_spec,
_opts_test_by_names=",".join(test_names),
_opts_verbose=options.verbose,
_opts_only_build_tests=True,
_opts_suppress_summary=True,
_opts_jobs=options.jobs,
_opts_include_non_automated=True,
_opts_build_report=build_report,
_opts_build_properties=build_properties
)
# Runs test suite in CLI mode
test_summary, shuffle_seed, test_summary_ext, test_suite_properties_ext, new_build_report, new_build_properties = single_test.execute()
(
test_summary,
shuffle_seed,
test_summary_ext,
test_suite_properties_ext,
new_build_report,
new_build_properties
) = single_test.execute()
else:
for target_name, toolchain_list in OFFICIAL_MBED_LIBRARY_BUILD:
if platforms is not None and not target_name in platforms:
print("Excluding %s from release" % target_name)
if platforms is not None and target_name not in platforms:
print(("Excluding %s from release" % target_name))
This conversation was marked as resolved by theotherjimmy

This comment has been minimized.

Copy link
@bridadan

bridadan Mar 28, 2019

Contributor

Similar thing as above.

Suggested change
print(("Excluding %s from release" % target_name))
print("Excluding {} from release".format(target_name))
continue

if target_name not in TARGET_NAMES:
print "Target '%s' is not a valid target. Excluding from release"
print("Target '{}' is not a valid target. Excluding".format(
target_name
))
continue

if options.official_only:
toolchains = (getattr(TARGET_MAP[target_name], 'default_toolchain', 'ARM'),)
toolchains = (getattr(
TARGET_MAP[target_name], 'default_toolchain', 'ARM'
),)
else:
toolchains = toolchain_list

if options.toolchains:
print "Only building using the following toolchains: %s" % (options.toolchains)
print("Building using the following toolchains: {}".format(
options.toolchains
))
toolchainSet = set(toolchains)
toolchains = toolchainSet.intersection(set((options.toolchains).split(',')))
toolchains = toolchainSet.intersection(
set((options.toolchains).split(','))
)

for toolchain in toolchains:
built_mbed_lib = build_mbed_libs(
@@ -179,18 +223,28 @@
build_profile=extract_profile(parser, options, toolchain),
)


# copy targets.json file as part of the release
copy(join(dirname(abspath(__file__)), '..', 'targets', 'targets.json'), MBED_LIBRARIES)
copy(
join(dirname(abspath(__file__)), '..', 'targets', 'targets.json'),
MBED_LIBRARIES
)

# Write summary of the builds
if options.report_build_file_name:
file_report_exporter = ReportExporter(ResultExporterType.JUNIT, package="build")
file_report_exporter.report_to_file(build_report, options.report_build_file_name, test_suite_properties=build_properties)

print "\n\nCompleted in: (%.2f)s" % (time() - start)

print_report_exporter = ReportExporter(ResultExporterType.PRINT, package="build")
file_report_exporter = ReportExporter(
ResultExporterType.JUNIT, package="build"
)
file_report_exporter.report_to_file(
build_report,
options.report_build_file_name,
test_suite_properties=build_properties
)

print("\n\nCompleted in: (%.2f)s" % (time() - start))

This comment has been minimized.

Copy link
@bridadan

bridadan Apr 12, 2019

Contributor

Oh gosh, I missed one.

Suggested change
print("\n\nCompleted in: (%.2f)s" % (time() - start))
print("\n\nCompleted in: ({0:.2f})s".format(time() - start))

References (because I didn't know how this worked until now):


print_report_exporter = ReportExporter(
ResultExporterType.PRINT, package="build"
)
status = status and print_report_exporter.report(build_report)

if not status:
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.