use this instead

pull/31880/head
Justin Newberry 1 year ago
parent e2afdc520d
commit c4c74163c7
  1. 13
      common/utils.py
  2. 7
      system/updated/casync/common.py

@ -1,7 +1,5 @@
from collections.abc import Callable from collections.abc import Callable
import dataclasses
from functools import lru_cache from functools import lru_cache
import json
from typing import TypeVar from typing import TypeVar
@ -23,14 +21,3 @@ class Freezable:
def cache(user_function: Callable[..., _RT], /) -> Callable[..., _RT]: def cache(user_function: Callable[..., _RT], /) -> Callable[..., _RT]:
return lru_cache(maxsize=None)(user_function) return lru_cache(maxsize=None)(user_function)
class DataClassJSONEncoder(json.JSONEncoder):
def default(self, o):
if dataclasses.is_dataclass(o):
return dataclasses.asdict(o)
return super().default(o)
def json_dump_dataclass(foo):
return json.dumps(foo, cls=DataClassJSONEncoder)

@ -1,7 +1,8 @@
import dataclasses
import json
import pathlib import pathlib
import subprocess import subprocess
from openpilot.common.utils import json_dump_dataclass
from openpilot.system.version import BUILD_METADATA_FILENAME, BuildMetadata from openpilot.system.version import BUILD_METADATA_FILENAME, BuildMetadata
@ -39,7 +40,9 @@ def create_caexclude_file(path: pathlib.Path):
def create_build_metadata_file(path: pathlib.Path, build_metadata: BuildMetadata): def create_build_metadata_file(path: pathlib.Path, build_metadata: BuildMetadata):
with open(path / BUILD_METADATA_FILENAME, "w") as f: with open(path / BUILD_METADATA_FILENAME, "w") as f:
f.write(json_dump_dataclass(build_metadata)) build_metadata_dict = dataclasses.asdict(build_metadata)
build_metadata_dict["openpilot"].pop("is_dirty") # this is determined at runtime
f.write(json.dumps(build_metadata_dict))
def create_casync_release(target_dir: pathlib.Path, output_dir: pathlib.Path, channel: str): def create_casync_release(target_dir: pathlib.Path, output_dir: pathlib.Path, channel: str):

Loading…
Cancel
Save