diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 55b89e607..1d811c724 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,5 +32,5 @@ repos: - -rn - -sn - -j0 - - --disable=C,R,W0613,W0511,W0212,W0201,W0311,W0106,W0603,W0621,W0703,W1203,W1514,E1136 + - --disable=C,R,W0613,W0511,W0212,W0201,W0311,W0106,W0603,W0621,W0703,W0719,W1203,W1514,E1136 - --generated-members="usb1.*" diff --git a/Dockerfile b/Dockerfile index c885e0bbb..c28d3f018 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ pkg-config \ python \ python-dev \ + qt5-default \ unzip \ wget \ zlib1g-dev \ @@ -50,8 +51,8 @@ RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-instal ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}" ENV PANDA_PATH=/tmp/openpilot/panda -ENV OPENPILOT_REF="ee0dd36a3c775dbd82493c84f4e7272c1eb3fcbd" -ENV OPENDBC_REF="342c0320dd271fb585db3cced397c5122078af85" +ENV OPENPILOT_REF="e276d2a417a5133fb91c93b2ef30df68a7d5f225" +ENV OPENDBC_REF="9ae9fbfe56f79dca66c673a6479751a15ad61780" COPY requirements.txt /tmp/ RUN pyenv install 3.8.10 && \ @@ -69,13 +70,13 @@ RUN cd /tmp && \ cd /tmp/tmppilot && \ git fetch origin $OPENPILOT_REF && \ git checkout $OPENPILOT_REF && \ - git submodule update --init cereal opendbc rednose_repo && \ + git submodule update --init cereal opendbc rednose_repo body && \ git -C opendbc fetch && \ git -C opendbc checkout $OPENDBC_REF && \ git -C opendbc reset --hard HEAD && \ git -C opendbc clean -xfd && \ mkdir /tmp/openpilot && \ - cp -pR SConstruct site_scons/ tools/ selfdrive/ system/ common/ cereal/ opendbc/ rednose/ third_party/ /tmp/openpilot && \ + cp -pR SConstruct site_scons/ tools/ selfdrive/ system/ common/ cereal/ opendbc/ rednose/ third_party/ body/ /tmp/openpilot && \ rm -rf /tmp/openpilot/panda && \ rm -rf /tmp/tmppilot diff --git a/tests/safety/test_nissan.py b/tests/safety/test_nissan.py index 6c0fac119..80d97f50f 100755 --- a/tests/safety/test_nissan.py +++ b/tests/safety/test_nissan.py @@ -24,7 +24,7 @@ class TestNissanSafety(common.PandaSafetyTest, common.AngleSteeringSafetyTest): ANGLE_RATE_DOWN = [5., 3.5, .4] # unwind limit def setUp(self): - self.packer = CANPackerPanda("nissan_x_trail_2017") + self.packer = CANPackerPanda("nissan_x_trail_2017_generated") self.safety = libpanda_py.libpanda self.safety.set_safety_hooks(Panda.SAFETY_NISSAN, 0) self.safety.init_tests() @@ -81,7 +81,7 @@ class TestNissanSafety(common.PandaSafetyTest, common.AngleSteeringSafetyTest): class TestNissanLeafSafety(TestNissanSafety): def setUp(self): - self.packer = CANPackerPanda("nissan_leaf_2018") + self.packer = CANPackerPanda("nissan_leaf_2018_generated") self.safety = libpanda_py.libpanda self.safety.set_safety_hooks(Panda.SAFETY_NISSAN, 0) self.safety.init_tests()