[bot] Update Python packages (#34140)

* Update Python packages

* pin

* fstring

* this too

---------

Co-authored-by: Vehicle Researcher <user@comma.ai>
Co-authored-by: Maxime Desroches <desroches.maxime@gmail.com>
pull/34156/head
commaci-public 5 months ago committed by GitHub
parent 8f7bbe4ee3
commit c6e4241bad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      msgq_repo
  2. 2
      panda
  3. 4
      pyproject.toml
  4. 10
      scripts/code_stats.py
  5. 4
      scripts/waste.py
  6. 2
      selfdrive/debug/can_printer.py
  7. 2
      selfdrive/debug/fingerprint_from_route.py
  8. 2
      selfdrive/debug/get_fingerprint.py
  9. 2
      selfdrive/selfdrived/tests/test_alerts.py
  10. 2
      system/hardware/pc/hardware.py
  11. 4
      system/hardware/tici/hardware.py
  12. 4
      system/qcomgpsd/qcomgpsd.py
  13. 2
      system/qcomgpsd/structs.py
  14. 2
      system/ubloxd/tests/print_gps_stats.py
  15. 6
      tools/camerastream/compressed_vipc.py
  16. 4
      tools/latencylogger/latency_logger.py
  17. 4
      tools/scripts/fetch_image_from_route.py
  18. 4
      tools/sim/lib/manual_ctrl.py
  19. 2076
      uv.lock

@ -1 +1 @@
Subproject commit e621ce0763803ea821f9b41a20b0b77d83ab6c97 Subproject commit 434ed2312c980b5504a4a75001d04c3ecbddf93f

@ -1 +1 @@
Subproject commit 2fbf0c5ff86f2e94021d7c937b9f8eb6839af484 Subproject commit c7cc2deaf046403899b5bcc964b9f48bfd508534

@ -31,6 +31,9 @@ dependencies = [
# body / webrtcd # body / webrtcd
"aiohttp", "aiohttp",
"aiortc", "aiortc",
# aiortc does not put an upper bound on pyopenssl and is now incompatible
# with the latest release
"pyopenssl < 24.3.0",
"pyaudio", "pyaudio",
# panda # panda
@ -239,6 +242,7 @@ exclude = [
"cereal", "cereal",
"panda", "panda",
"opendbc", "opendbc",
"opendbc_repo",
"rednose_repo", "rednose_repo",
"tinygrad_repo", "tinygrad_repo",
"teleoprtc", "teleoprtc",

@ -37,7 +37,7 @@ for f in sorted(pyf):
lns = len(src.split("\n")) lns = len(src.split("\n"))
tree = ast.parse(src) tree = ast.parse(src)
Analyzer().visit(tree) Analyzer().visit(tree)
print("%5d %s %s" % (lns, f, xbit)) print(f"{lns:5d} {f} {xbit}")
if 'test' in f: if 'test' in f:
testlns += lns testlns += lns
elif f.startswith(('tools/', 'scripts/', 'selfdrive/debug')): elif f.startswith(('tools/', 'scripts/', 'selfdrive/debug')):
@ -47,8 +47,8 @@ for f in sorted(pyf):
else: else:
tlns += lns tlns += lns
print("%d lines of openpilot python" % tlns) print(f"{tlns} lines of openpilot python")
print("%d lines of car ports" % carlns) print(f"{carlns} lines of car ports")
print("%d lines of tools/scripts/debug" % scriptlns) print(f"{scriptlns} lines of tools/scripts/debug")
print("%d lines of tests" % testlns) print(f"{testlns} lines of tests")
#print(sorted(list(imps))) #print(sorted(list(imps)))

@ -16,9 +16,9 @@ def waste(core):
j = 0 j = 0
while 1: while 1:
if (i % 100) == 0: if (i % 100) == 0:
setproctitle("%3d: %8d" % (core, i)) setproctitle(f"{core:3d}: {i:8d}")
lt = time.monotonic() lt = time.monotonic()
print("%3d: %8d %f %.2f" % (core, i, lt-st, j)) print(f"{core:3d}: {i:8d} {lt-st:f} {j:.2f}")
st = lt st = lt
i += 1 i += 1
j = np.sum(np.matmul(m1, m2)) j = np.sum(np.matmul(m1, m2))

@ -28,7 +28,7 @@ def can_printer(bus, max_msg, addr, ascii_decode):
x = binascii.hexlify(msgs[_addr][-1]).decode('ascii') x = binascii.hexlify(msgs[_addr][-1]).decode('ascii')
freq = len(msgs[_addr]) / (time.monotonic() - start) freq = len(msgs[_addr]) / (time.monotonic() - start)
if max_msg is None or _addr < max_msg: if max_msg is None or _addr < max_msg:
dd += "%04X(%4d)(%6d)(%3dHz) %s %s\n" % (_addr, _addr, len(msgs[_addr]), freq, x.ljust(20), a) dd += f"{_addr:04X}({_addr:4d})({len(msgs[_addr]):6d})({freq:3}dHz) {x.ljust(20)} {a}\n"
print(dd) print(dd)
lp = time.monotonic() lp = time.monotonic()

@ -22,7 +22,7 @@ def get_fingerprint(lr):
msgs[c.address] = len(c.dat) msgs[c.address] = len(c.dat)
# show CAN fingerprint # show CAN fingerprint
fingerprint = ', '.join("%d: %d" % v for v in sorted(msgs.items())) fingerprint = ', '.join(f"{v[0]}: {v[1]}" for v in sorted(msgs.items()))
print(f"\nfound {len(msgs)} messages. CAN fingerprint:\n") print(f"\nfound {len(msgs)} messages. CAN fingerprint:\n")
print(fingerprint) print(fingerprint)

@ -25,7 +25,7 @@ while True:
if c.src % 0x80 == 0 and c.address < 0x800 and c.address not in (0x7df, 0x7e0, 0x7e8): if c.src % 0x80 == 0 and c.address < 0x800 and c.address not in (0x7df, 0x7e0, 0x7e8):
msgs[c.address] = len(c.dat) msgs[c.address] = len(c.dat)
fingerprint = ', '.join("%d: %d" % v for v in sorted(msgs.items())) fingerprint = ', '.join(f"{v[0]}: {v[1]}" for v in sorted(msgs.items()))
print(f"number of messages {len(msgs)}:") print(f"number of messages {len(msgs)}:")
print(f"fingerprint {fingerprint}") print(f"fingerprint {fingerprint}")

@ -42,7 +42,7 @@ class TestAlerts:
for name, e in events.items(): for name, e in events.items():
if not name.endswith("DEPRECATED"): if not name.endswith("DEPRECATED"):
fail_msg = "%s @%d not in EVENTS" % (name, e) fail_msg = f"{name} @{e} not in EVENTS"
assert e in EVENTS.keys(), fail_msg assert e in EVENTS.keys(), fail_msg
# ensure alert text doesn't exceed allowed width # ensure alert text doesn't exceed allowed width

@ -21,7 +21,7 @@ class Pc(HardwareBase):
print("uninstall") print("uninstall")
def get_imei(self, slot): def get_imei(self, slot):
return "%015d" % random.randint(0, 1 << 32) return f"{random.randint(0, 1 << 32):015d}"
def get_serial(self): def get_serial(self):
return "cccccccc" return "cccccccc"

@ -323,8 +323,8 @@ class Tici(HardwareBase):
os.system("sudo poweroff") os.system("sudo poweroff")
def get_thermal_config(self): def get_thermal_config(self):
return ThermalConfig(cpu=(["cpu%d-silver-usr" % i for i in range(4)] + return ThermalConfig(cpu=([f"cpu{i}-silver-usr" for i in range(4)] +
["cpu%d-gold-usr" % i for i in range(4)], 1000), [f"cpu{i}-gold-usr" for i in range(4)], 1000),
gpu=(("gpu0-usr", "gpu1-usr"), 1000), gpu=(("gpu0-usr", "gpu1-usr"), 1000),
mem=("ddr-usr", 1000), mem=("ddr-usr", 1000),
bat=(None, 1), bat=(None, 1),

@ -273,7 +273,7 @@ def main() -> NoReturn:
(pending_msgs, log_outer_length), inner_log_packet = unpack_from('<BH', payload), payload[calcsize('<BH'):] (pending_msgs, log_outer_length), inner_log_packet = unpack_from('<BH', payload), payload[calcsize('<BH'):]
if pending_msgs > 0: if pending_msgs > 0:
cloudlog.debug("have %d pending messages" % pending_msgs) cloudlog.debug(f"have {pending_msgs} pending messages")
assert log_outer_length == len(inner_log_packet) assert log_outer_length == len(inner_log_packet)
(log_inner_length, log_type, log_time), log_payload = unpack_from('<HHQ', inner_log_packet), inner_log_packet[calcsize('<HHQ'):] (log_inner_length, log_type, log_time), log_payload = unpack_from('<HHQ', inner_log_packet), inner_log_packet[calcsize('<HHQ'):]
@ -283,7 +283,7 @@ def main() -> NoReturn:
continue continue
if DEBUG: if DEBUG:
print("%.4f: got log: %x len %d" % (time.time(), log_type, len(log_payload))) print(f"{time.time():.4f}: got log: {log_type} len {len(log_payload)}")
if log_type == LOG_GNSS_OEMDRE_MEASUREMENT_REPORT: if log_type == LOG_GNSS_OEMDRE_MEASUREMENT_REPORT:
msg = messaging.new_message('qcomGnss', valid=True) msg = messaging.new_message('qcomGnss', valid=True)

@ -322,7 +322,7 @@ def parse_struct(ss):
cnt = int(nam.split("[")[1].split("]")[0]) cnt = int(nam.split("[")[1].split("]")[0])
st += st[-1]*(cnt-1) st += st[-1]*(cnt-1)
for i in range(cnt): for i in range(cnt):
nams.append("%s[%d]" % (nam.split("[")[0], i)) nams.append(f'{nam.split("[")[0]}[{i}]')
else: else:
nams.append(nam) nams.append(nam)
return st, nams return st, nams

@ -13,7 +13,7 @@ if __name__ == "__main__":
cnos = [] cnos = []
for m in ug.measurementReport.measurements: for m in ug.measurementReport.measurements:
cnos.append(m.cno) cnos.append(m.cno)
print("Sats: %d Accuracy: %.2f m cnos" % (ug.measurementReport.numMeas, gle.horizontalAccuracy), sorted(cnos)) print(f"Sats: {ug.measurementReport.numMeas} Accuracy: {gle.horizontalAccuracy:.2f} m cnos", sorted(cnos))
except Exception: except Exception:
pass pass
sm.update() sm.update()

@ -101,9 +101,9 @@ def decoder(addr, vipc_server, vst, nvidia, W, H, debug=False):
pc_latency = (time.monotonic()-time_q[0])*1000 pc_latency = (time.monotonic()-time_q[0])*1000
time_q = time_q[1:] time_q = time_q[1:]
if debug: if debug:
print("%2d %4d %.3f %.3f roll %6.2f ms latency %6.2f ms + %6.2f ms + %6.2f ms = %6.2f ms" print(f"{len(msgs):2d} {evta.idx.encodeId:4d} {evt.logMonoTime/1e9:.3f} {evta.idx.timestampEof/1e6:.3f} \
% (len(msgs), evta.idx.encodeId, evt.logMonoTime/1e9, evta.idx.timestampEof/1e6, frame_latency, roll {frame_latency:6.2f} ms latency {process_latency:6.2f} ms + {network_latency:6.2f} ms + {pc_latency:6.2f} ms \
process_latency, network_latency, pc_latency, process_latency+network_latency+pc_latency ), len(evta.data), sock_name) = {process_latency+network_latency+pc_latency:6.2f} ms", len(evta.data), sock_name)
class CompressedVipc: class CompressedVipc:

@ -168,9 +168,9 @@ def print_timestamps(timestamps, durations, start_times, relative):
print(" "+service) print(" "+service)
events = timestamps[frame_id][service] events = timestamps[frame_id][service]
for event, time in sorted(events, key = lambda x: x[1]): for event, time in sorted(events, key = lambda x: x[1]):
print(" "+'%-53s%-53s' %(event, str((time-t0)/1e6))) print(" "+f'{event:<53s}{str((time-t0)/1e6):<53s}')
for event, time in durations[frame_id][service]: for event, time in durations[frame_id][service]:
print(" "+'%-53s%-53s' %(event, str(time*1000))) print(" "+f'{event:<53s}{str(time*1000):<53s}')
def graph_timestamps(timestamps, start_times, end_times, relative, offset_services=False, title=""): def graph_timestamps(timestamps, start_times, end_times, relative, offset_services=False, title=""):
plt.rcParams.update({'font.size': 18}) plt.rcParams.update({'font.size': 18})

@ -31,11 +31,11 @@ print("got api response")
segments = r.json()[camera] segments = r.json()[camera]
if segment >= len(segments): if segment >= len(segments):
raise Exception("segment %d not found, got %d segments" % (segment, len(segments))) raise Exception(f"segment {segment} not found, got {len(segments)} segments")
fr = FrameReader(segments[segment]) fr = FrameReader(segments[segment])
if frame >= fr.frame_count: if frame >= fr.frame_count:
raise Exception("frame %d not found, got %d frames" % (frame, fr.frame_count)) raise Exception("frame {frame} not found, got {fr.frame_count} frames")
im = Image.fromarray(fr.get(frame, count=1, pix_fmt="rgb24")[0]) im = Image.fromarray(fr.get(frame, count=1, pix_fmt="rgb24")[0])
fn = f"uxxx_{route.replace('|', '_')}_{segment}_{frame}.png" fn = f"uxxx_{route.replace('|', '_')}_{segment}_{frame}.png"

@ -133,8 +133,8 @@ def wheel_poll_thread(q: 'Queue[str]') -> NoReturn:
button_name_list.append(btn_name) button_name_list.append(btn_name)
button_states[btn_name] = 0 button_states[btn_name] = 0
print('%d axes found: %s' % (num_axes, ', '.join(axis_name_list))) print(f'{num_axes} axes found: {", ".join(axis_name_list)}')
print('%d buttons found: %s' % (num_buttons, ', '.join(button_name_list))) print(f'{num_buttons} buttons found: {", ".join(button_name_list)}')
# Enable FF # Enable FF
import evdev import evdev

2076
uv.lock

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save