From ebed2d1dcc53f092696b61fd1e004045c9bde893 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 31 May 2020 17:34:16 -0700 Subject: [PATCH] enable flake8 E251: unexpected spaces around keyword / parameter equals --- .pre-commit-config.yaml | 2 +- common/api/__init__.py | 2 +- panda | 2 +- selfdrive/debug/cpu_usage_stat.py | 2 +- .../test/longitudinal_maneuvers/maneuver.py | 6 +- .../longitudinal_maneuvers/maneuverplots.py | 2 +- .../test/longitudinal_maneuvers/plant.py | 2 +- .../test_longitudinal.py | 92 +++++++++---------- tools/livedm/livedm.py | 2 +- 9 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7b77f3f5b..1c31c08fc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: flake8 exclude: '^(pyextra)|(external)|(cereal)|(rednose)|(panda)|(laika)|(laika_repo)|(rednose_repo)/' args: - - --ignore=E111,E114,E121,E122,E123,E124,E126,E127,E128,E201,E202,E203,E226,E241,E251,E265,E266,E302,E305,E402,E501,E502,E722,E741,W504 + - --ignore=E111,E114,E121,E122,E123,E124,E126,E127,E128,E201,E202,E203,E226,E241,E265,E266,E302,E305,E402,E501,E502,E722,E741,W504 - --statistics - repo: local hooks: diff --git a/common/api/__init__.py b/common/api/__init__.py index f44e48f96..b030c3333 100644 --- a/common/api/__init__.py +++ b/common/api/__init__.py @@ -38,4 +38,4 @@ def api_get(endpoint, method='GET', timeout=None, access_token=None, **params): headers['User-Agent'] = "openpilot-" + version - return requests.request(method, backend+endpoint, timeout=timeout, headers = headers, params=params) + return requests.request(method, backend+endpoint, timeout=timeout, headers=headers, params=params) diff --git a/panda b/panda index 275e76c2b..803963848 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 275e76c2b2f9206c82990fe7ba0a6a96ecb8a0bc +Subproject commit 8039638482ebedb9cd10cb1eac083631919ac95e diff --git a/selfdrive/debug/cpu_usage_stat.py b/selfdrive/debug/cpu_usage_stat.py index 1dcc4996b..b18199885 100755 --- a/selfdrive/debug/cpu_usage_stat.py +++ b/selfdrive/debug/cpu_usage_stat.py @@ -113,7 +113,7 @@ if __name__ == "__main__": for stat_type in ['avg', 'min', 'max']: msg += '\n {}: {}'.format(stat_type, [name + ':' + str(round(stat[stat_type][name]*100, 2)) for name in cpu_time_names]) l.append((os.path.basename(k), stat['avg']['total'], msg)) - l.sort(key= lambda x: -x[1]) + l.sort(key=lambda x: -x[1]) for x in l: print(x[2]) print('avg sum: {0:.2%} over {1} samples {2} seconds\n'.format( diff --git a/selfdrive/test/longitudinal_maneuvers/maneuver.py b/selfdrive/test/longitudinal_maneuvers/maneuver.py index e79cf61d2..d60dcc4e3 100644 --- a/selfdrive/test/longitudinal_maneuvers/maneuver.py +++ b/selfdrive/test/longitudinal_maneuvers/maneuver.py @@ -25,9 +25,9 @@ class Maneuver(): def evaluate(self): """runs the plant sim and returns (score, run_data)""" plant = Plant( - lead_relevancy = self.lead_relevancy, - speed = self.speed, - distance_lead = self.distance_lead + lead_relevancy=self.lead_relevancy, + speed=self.speed, + distance_lead=self.distance_lead ) logs = defaultdict(list) diff --git a/selfdrive/test/longitudinal_maneuvers/maneuverplots.py b/selfdrive/test/longitudinal_maneuvers/maneuverplots.py index 9a5ea6155..503c18445 100644 --- a/selfdrive/test/longitudinal_maneuvers/maneuverplots.py +++ b/selfdrive/test/longitudinal_maneuvers/maneuverplots.py @@ -7,7 +7,7 @@ import pylab from selfdrive.config import Conversions as CV class ManeuverPlot(): - def __init__(self, title = None): + def __init__(self, title=None): self.time_array = [] self.gas_array = [] diff --git a/selfdrive/test/longitudinal_maneuvers/plant.py b/selfdrive/test/longitudinal_maneuvers/plant.py index 45a4a01f5..8ac65d855 100755 --- a/selfdrive/test/longitudinal_maneuvers/plant.py +++ b/selfdrive/test/longitudinal_maneuvers/plant.py @@ -171,7 +171,7 @@ class Plant(): def current_time(self): return float(self.rk.frame) / self.rate - def step(self, v_lead=0.0, cruise_buttons=None, grade=0.0, publish_model = True): + def step(self, v_lead=0.0, cruise_buttons=None, grade=0.0, publish_model=True): gen_signals, gen_checks = get_can_signals(CP) sgs = [s[0] for s in gen_signals] msgs = [s[1] for s in gen_signals] diff --git a/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py b/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py index 08b6cd047..a7fb64b22 100755 --- a/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py +++ b/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py @@ -34,8 +34,8 @@ maneuvers = [ Maneuver( 'while cruising at 40 mph, change cruise speed to 50mph', duration=30., - initial_speed = 40. * CV.MPH_TO_MS, - cruise_button_presses = [(CB.DECEL_SET, 2.), (0, 2.3), + initial_speed=40. * CV.MPH_TO_MS, + cruise_button_presses=[(CB.DECEL_SET, 2.), (0, 2.3), (CB.RES_ACCEL, 10.), (0, 10.1), (CB.RES_ACCEL, 10.2), (0, 10.3)], checks=[check_engaged], @@ -44,7 +44,7 @@ maneuvers = [ 'while cruising at 60 mph, change cruise speed to 50mph', duration=30., initial_speed=60. * CV.MPH_TO_MS, - cruise_button_presses = [(CB.DECEL_SET, 2.), (0, 2.3), + cruise_button_presses=[(CB.DECEL_SET, 2.), (0, 2.3), (CB.DECEL_SET, 10.), (0, 10.1), (CB.DECEL_SET, 10.2), (0, 10.3)], checks=[check_engaged], @@ -53,93 +53,93 @@ maneuvers = [ 'while cruising at 20mph, grade change +10%', duration=25., initial_speed=20. * CV.MPH_TO_MS, - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3)], - grade_values = [0., 0., 1.0], - grade_breakpoints = [0., 10., 11.], + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3)], + grade_values=[0., 0., 1.0], + grade_breakpoints=[0., 10., 11.], checks=[check_engaged], ), Maneuver( 'while cruising at 20mph, grade change -10%', duration=25., initial_speed=20. * CV.MPH_TO_MS, - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3)], - grade_values = [0., 0., -1.0], - grade_breakpoints = [0., 10., 11.], + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3)], + grade_values=[0., 0., -1.0], + grade_breakpoints=[0., 10., 11.], checks=[check_engaged], ), Maneuver( 'approaching a 40mph car while cruising at 60mph from 100m away', duration=30., - initial_speed = 60. * CV.MPH_TO_MS, + initial_speed=60. * CV.MPH_TO_MS, lead_relevancy=True, initial_distance_lead=100., - speed_lead_values = [40.*CV.MPH_TO_MS, 40.*CV.MPH_TO_MS], - speed_lead_breakpoints = [0., 100.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3)], + speed_lead_values=[40.*CV.MPH_TO_MS, 40.*CV.MPH_TO_MS], + speed_lead_breakpoints=[0., 100.], + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3)], checks=[check_engaged, check_no_collision], ), Maneuver( 'approaching a 0mph car while cruising at 40mph from 150m away', duration=30., - initial_speed = 40. * CV.MPH_TO_MS, + initial_speed=40. * CV.MPH_TO_MS, lead_relevancy=True, initial_distance_lead=150., - speed_lead_values = [0.*CV.MPH_TO_MS, 0.*CV.MPH_TO_MS], - speed_lead_breakpoints = [0., 100.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3)], + speed_lead_values=[0.*CV.MPH_TO_MS, 0.*CV.MPH_TO_MS], + speed_lead_breakpoints=[0., 100.], + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3)], checks=[check_engaged, check_no_collision], ), Maneuver( 'steady state following a car at 20m/s, then lead decel to 0mph at 1m/s^2', duration=50., - initial_speed = 20., + initial_speed=20., lead_relevancy=True, initial_distance_lead=35., - speed_lead_values = [20., 20., 0.], - speed_lead_breakpoints = [0., 15., 35.0], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3)], + speed_lead_values=[20., 20., 0.], + speed_lead_breakpoints=[0., 15., 35.0], + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3)], checks=[check_engaged, check_no_collision], ), Maneuver( 'steady state following a car at 20m/s, then lead decel to 0mph at 2m/s^2', duration=50., - initial_speed = 20., + initial_speed=20., lead_relevancy=True, initial_distance_lead=35., - speed_lead_values = [20., 20., 0.], - speed_lead_breakpoints = [0., 15., 25.0], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3)], + speed_lead_values=[20., 20., 0.], + speed_lead_breakpoints=[0., 15., 25.0], + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3)], checks=[check_engaged, check_no_collision], ), Maneuver( 'steady state following a car at 20m/s, then lead decel to 0mph at 3m/s^2', duration=50., - initial_speed = 20., + initial_speed=20., lead_relevancy=True, initial_distance_lead=35., - speed_lead_values = [20., 20., 0.], - speed_lead_breakpoints = [0., 15., 21.66], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3)], + speed_lead_values=[20., 20., 0.], + speed_lead_breakpoints=[0., 15., 21.66], + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3)], checks=[check_engaged, check_fcw], ), Maneuver( 'steady state following a car at 20m/s, then lead decel to 0mph at 5m/s^2', duration=40., - initial_speed = 20., + initial_speed=20., lead_relevancy=True, initial_distance_lead=35., - speed_lead_values = [20., 20., 0.], - speed_lead_breakpoints = [0., 15., 19.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3)], + speed_lead_values=[20., 20., 0.], + speed_lead_breakpoints=[0., 15., 19.], + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3)], checks=[check_engaged, check_fcw], ), Maneuver( 'starting at 0mph, approaching a stopped car 100m away', duration=30., - initial_speed = 0., + initial_speed=0., lead_relevancy=True, initial_distance_lead=100., - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3), + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3), (CB.RES_ACCEL, 1.4), (0.0, 1.5), (CB.RES_ACCEL, 1.6), (0.0, 1.7), (CB.RES_ACCEL, 1.8), (0.0, 1.9)], @@ -153,7 +153,7 @@ maneuvers = [ initial_distance_lead=49., speed_lead_values=[30., 30., 29., 31., 29., 31., 29.], speed_lead_breakpoints=[0., 6., 8., 12., 16., 20., 24.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3), + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3), (CB.RES_ACCEL, 1.4), (0.0, 1.5), (CB.RES_ACCEL, 1.6), (0.0, 1.7)], checks=[check_engaged, check_no_collision], @@ -166,7 +166,7 @@ maneuvers = [ initial_distance_lead=20., speed_lead_values=[10., 0., 0., 10., 0., 10.], speed_lead_breakpoints=[10., 20., 30., 40., 50., 60.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3), + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3), (CB.RES_ACCEL, 1.4), (0.0, 1.5), (CB.RES_ACCEL, 1.6), (0.0, 1.7)], checks=[check_engaged, check_no_collision], @@ -179,7 +179,7 @@ maneuvers = [ initial_distance_lead=4., speed_lead_values=[0, 0 , 45], speed_lead_breakpoints=[0, 10., 40.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3), + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3), (CB.RES_ACCEL, 1.4), (0.0, 1.5), (CB.RES_ACCEL, 1.6), (0.0, 1.7), (CB.RES_ACCEL, 1.8), (0.0, 1.9), @@ -195,7 +195,7 @@ maneuvers = [ initial_distance_lead=20., speed_lead_values=[10., 0., 0., 10., 0., 0.] , speed_lead_breakpoints=[10., 20., 30., 40., 50., 60.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3), + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3), (CB.RES_ACCEL, 1.4), (0.0, 1.5), (CB.RES_ACCEL, 1.6), (0.0, 1.7)], checks=[check_engaged, check_no_collision], @@ -208,7 +208,7 @@ maneuvers = [ initial_distance_lead=20., speed_lead_values=[10., 0., 0., 10., 0., 0.] , speed_lead_breakpoints=[10., 13., 26., 33., 36., 45.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3), + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3), (CB.RES_ACCEL, 1.4), (0.0, 1.5), (CB.RES_ACCEL, 1.6), (0.0, 1.7)], checks=[check_engaged, check_no_collision], @@ -221,7 +221,7 @@ maneuvers = [ initial_distance_lead=10., speed_lead_values=[20., 10.], speed_lead_breakpoints=[1., 11.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3), + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3), (CB.RES_ACCEL, 1.4), (0.0, 1.5), (CB.RES_ACCEL, 1.6), (0.0, 1.7), (CB.RES_ACCEL, 1.8), (0.0, 1.9), @@ -237,7 +237,7 @@ maneuvers = [ initial_distance_lead=10., speed_lead_values=[20., 0.], speed_lead_breakpoints=[1., 11.], - cruise_button_presses = [(CB.DECEL_SET, 1.2), (0, 1.3), + cruise_button_presses=[(CB.DECEL_SET, 1.2), (0, 1.3), (CB.RES_ACCEL, 1.4), (0.0, 1.5), (CB.RES_ACCEL, 1.6), (0.0, 1.7), (CB.RES_ACCEL, 1.8), (0.0, 1.9), @@ -253,7 +253,7 @@ maneuvers = [ initial_distance_lead=100., speed_lead_values=[20.], speed_lead_breakpoints=[1.], - cruise_button_presses = [], + cruise_button_presses=[], checks=[check_fcw], ), Maneuver( @@ -264,7 +264,7 @@ maneuvers = [ initial_distance_lead=35., speed_lead_values=[20., 0.], speed_lead_breakpoints=[3., 23.], - cruise_button_presses = [], + cruise_button_presses=[], checks=[check_fcw], ), Maneuver( @@ -275,7 +275,7 @@ maneuvers = [ initial_distance_lead=35., speed_lead_values=[20., 0.], speed_lead_breakpoints=[3., 9.6], - cruise_button_presses = [], + cruise_button_presses=[], checks=[check_fcw], ), Maneuver( @@ -286,7 +286,7 @@ maneuvers = [ initial_distance_lead=35., speed_lead_values=[20., 0.], speed_lead_breakpoints=[3., 7.], - cruise_button_presses = [], + cruise_button_presses=[], checks=[check_fcw], ) ] diff --git a/tools/livedm/livedm.py b/tools/livedm/livedm.py index 906a1da66..bb44cf56d 100644 --- a/tools/livedm/livedm.py +++ b/tools/livedm/livedm.py @@ -71,7 +71,7 @@ if __name__ == "__main__": else: cv2.putText(img, 'you not found', (int(facePosition[0]*160+40), int(facePosition[1]*320+110)), cv2.FONT_ITALIC, 0.5, (64, 64, 64)) draw_pose(img, faceOrientation, facePosition, - W = 160, H = 320, xyoffset = (0, 0), faceprob=faceProb) + W=160, H=320, xyoffset=(0, 0), faceprob=faceProb) pygame.surfarray.blit_array(camera_surface, img.swapaxes(0, 1)) camera_surface_2x = pygame.transform.scale2x(camera_surface)