Add a column_limit=80 to yapf setup.cfg
Also apply the formatting to the .pyl files.
Change-Id: I5dc668b53570d042862d2de5948b72d1cf6d31b3
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285941
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#38797}
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 626c26f..86a5161 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -224,8 +224,7 @@
},
'quick-perf-tests': {
'$mixin_append': {
- 'args':
- ['--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/', '--nologs']
+ 'args': ['--force_fieldtrials=WebRTC-QuickPerfTest/Enabled/', '--nologs']
}
},
'redfin': {
diff --git a/infra/specs/setup.cfg b/infra/specs/setup.cfg
index 7dd0a8a..d5ed695 100644
--- a/infra/specs/setup.cfg
+++ b/infra/specs/setup.cfg
@@ -8,4 +8,5 @@
# This is the style settings used when running yapf on .pyl files.
[yapf]
-continuation_indent_width = 2
\ No newline at end of file
+continuation_indent_width = 2
+column_limit = 80
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 255ff3a..f58f384 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -68,8 +68,7 @@
'Fuchsia Builder': {},
'Fuchsia Release': {
'os_type': 'linux',
- 'mixins':
- ['linux-bionic', 'x86-64', 'has_native_resultdb_integration'],
+ 'mixins': ['linux-bionic', 'x86-64', 'has_native_resultdb_integration'],
'test_suites': {
'isolated_scripts': 'fuchsia_compatible_tests',
},
@@ -229,9 +228,9 @@
'iOS64 Release': {},
'iOS64 Sim Debug (iOS 12)': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-12.4', 'xcode_13_main', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-12.4',
+ 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -239,9 +238,9 @@
},
'iOS64 Sim Debug (iOS 13)': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-13.6', 'xcode_13_main', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-13.6',
+ 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -249,9 +248,9 @@
},
'iOS64 Sim Debug (iOS 14)': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-14.5', 'xcode_13_main', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-14.5',
+ 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -295,9 +294,8 @@
},
'Perf Android32 (R Pixel5)': {
'mixins': [
- 'redfin', 'android-devices', 'perf-pool', 'timeout-3h',
- 'perf-output', 'has_native_resultdb_integration',
- 'chromium-tester-service-account'
+ 'redfin', 'android-devices', 'perf-pool', 'timeout-3h', 'perf-output',
+ 'has_native_resultdb_integration', 'chromium-tester-service-account'
],
'test_suites': {
'gtest_tests': 'android_perf_tests',
@@ -325,9 +323,8 @@
},
'Perf Android64 (R Pixel5)': {
'mixins': [
- 'redfin', 'android-devices', 'perf-pool', 'timeout-3h',
- 'perf-output', 'has_native_resultdb_integration',
- 'chromium-tester-service-account'
+ 'redfin', 'android-devices', 'perf-pool', 'timeout-3h', 'perf-output',
+ 'has_native_resultdb_integration', 'chromium-tester-service-account'
],
'test_suites': {
'gtest_tests': 'android_perf_tests',
@@ -491,8 +488,7 @@
'android_compile_x86_rel': {},
'fuchsia_rel': {
'os_type': 'linux',
- 'mixins':
- ['linux-bionic', 'x86-64', 'has_native_resultdb_integration'],
+ 'mixins': ['linux-bionic', 'x86-64', 'has_native_resultdb_integration'],
'test_suites': {
'isolated_scripts': 'fuchsia_compatible_tests',
},
@@ -501,9 +497,9 @@
'ios_compile_arm64_rel': {},
'ios_sim_x64_dbg_ios12': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-12.4', 'xcode_13_main', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-12.4',
+ 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -511,9 +507,9 @@
},
'ios_sim_x64_dbg_ios13': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-13.6', 'xcode_13_main', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-13.6',
+ 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
@@ -521,9 +517,9 @@
},
'ios_sim_x64_dbg_ios14': {
'mixins': [
- 'mac_12_x64', 'chromium-tester-service-account',
- 'ios-simulator-14.5', 'xcode_13_main', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg'
+ 'mac_12_x64', 'chromium-tester-service-account', 'ios-simulator-14.5',
+ 'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'out_dir_arg'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests',
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index 5eff5d6..bdea55a 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -243,7 +243,8 @@
'android_pure_release_bot_arm64': ['android', 'pure_release_bot', 'arm64'],
'android_release_bot_arm': ['android', 'release_bot', 'arm'],
'android_release_bot_arm64': ['android', 'release_bot', 'arm64'],
- 'android_release_bot_arm_reclient': ['android', 'release_bot_reclient', 'arm'],
+ 'android_release_bot_arm_reclient':
+ ['android', 'release_bot_reclient', 'arm'],
'android_release_bot_x64': ['android', 'release_bot', 'x64'],
'android_release_bot_x86': ['android', 'release_bot', 'x86'],
'asan_lsan_clang_release_bot_x64':
@@ -280,9 +281,8 @@
'ios', 'release_bot', 'arm64', 'ios_code_signing_identity_description',
'xctest'
],
- 'ios_release_bot_arm64': [
- 'ios', 'release_bot', 'arm64', 'no_ios_code_signing', 'xctest',
- ],
+ 'ios_release_bot_arm64':
+ ['ios', 'release_bot', 'arm64', 'no_ios_code_signing', 'xctest'],
'libfuzzer_asan_release_bot_x64': [
'libfuzzer', 'asan', 'optimize_for_fuzzing', 'openh264',
'pure_release_bot', 'x64'
@@ -307,22 +307,21 @@
'release_bot_arm64': ['openh264', 'release_bot', 'arm64'],
'release_bot_x64': ['openh264', 'release_bot', 'x64'],
'release_bot_x64_fuchsia': ['openh264', 'release_bot', 'x64', 'fuchsia'],
- 'release_bot_x64_reclient': [
- 'openh264', 'release_bot_reclient', 'x64',
- ],
+ 'release_bot_x64_reclient': ['openh264', 'release_bot_reclient', 'x64'],
'release_bot_x86': ['openh264', 'release_bot', 'x86'],
- 'rtti_no_sctp_android_arm': [
- 'android', 'debug_static_bot', 'arm', 'rtti', 'no_sctp'
- ],
+ 'rtti_no_sctp_android_arm':
+ ['android', 'debug_static_bot', 'arm', 'rtti', 'no_sctp'],
'rtti_no_sctp_no_unicode_win_x86':
['debug_bot', 'x86', 'rtti', 'no_sctp', 'win_undef_unicode'],
'rtti_no_sctp_x64': ['debug_bot', 'x64', 'rtti', 'no_sctp'],
'tsan_clang_release_bot_x64':
['tsan', 'clang', 'openh264', 'pure_release_bot', 'x64'],
- 'ubsan_clang_release_bot_x64':
- ['ubsan', 'clang', 'openh264', 'pure_release_bot', 'x64'],
- 'ubsan_vptr_clang_release_bot_x64':
- ['ubsan_vptr', 'clang', 'openh264', 'pure_release_bot', 'x64'],
+ 'ubsan_clang_release_bot_x64': [
+ 'ubsan', 'clang', 'openh264', 'pure_release_bot', 'x64'
+ ],
+ 'ubsan_vptr_clang_release_bot_x64': [
+ 'ubsan_vptr', 'clang', 'openh264', 'pure_release_bot', 'x64'
+ ],
'win_asan_clang_release_bot_x64': [
'asan',
'clang',
