Merge pull request commaai#173 from xx979xx/HKG

6.5

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve openpilot
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**How to reproduce or log data**
+Steps to reproduce the behavior, or a explorer/cabana link to the exact drive and timestamp of when the bug occurred.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+** Device/Version information (please complete the following information):**
+ - Device: [e.g. EON/EON Gold]
+ - Version: [e.g. 0.6.4], or commit hash when on devel
+ - Car make/model [e.g. Toyota Prius 2016]
+
+**Additional context**
+Add any other context about the problem here.

.github/pull_request_template.md

@@ -0,0 +1,21 @@
+Choose one of the templates below:
+
+# Fingerprint
+This pull requests adds a fingerprint for <Make - Model - Year - Trim>.
+
+This is an explorer link to a drive with the stock system enabled: ...
+
+# Car support
+This pull requests adds support for <Make - Model - Year - Trim>.
+
+This is an explorer link to a drive with the stock system enabled: ...
+This is an explorer link to a drive with openpilot system enabled: ...
+
+# Feature
+This pull requests adds feature X
+
+## Description
+Explain what the feature does
+
+## Testing
+Explain how the feature was tested. Either by the added unit tests, or what tests were performed while driving.

.gitignore

@@ -4,6 +4,7 @@ venv/
 .ipynb_checkpoints
 .idea
 .sconsign.dblite
+.vscode
 model2.png
 a.out
 
@@ -30,7 +31,7 @@ selfdrive/logcatd/logcatd
 selfdrive/mapd/default_speeds_by_region.json
 selfdrive/proclogd/proclogd
 selfdrive/ui/ui
-selfdrive/test/tests/plant/out
+selfdrive/test/longitudinal_maneuvers/out
 selfdrive/visiond/visiond
 selfdrive/loggerd/loggerd
 selfdrive/sensord/gpsd

Dockerfile.openpilot

@@ -6,43 +6,66 @@ RUN apt-get update && apt-get install -y \
     build-essential \
     bzip2 \
     clang \
+    cmake \
+    curl \
+    ffmpeg \
     git \
     libarchive-dev \
-    libavcodec-dev \
-    libavdevice-dev \
-    libavfilter-dev \
-    libavresample-dev \
-    libavutil-dev \
+    libbz2-dev \
+    libcurl4-openssl-dev \
+    libeigen3-dev \
     libffi-dev \
+    libglew-dev \
     libglib2.0-0 \
+    liblzma-dev \
+    libmysqlclient-dev \
+    libomp-dev \
+    libopencv-dev \
     libssl-dev \
-    libswscale-dev \
     libtool \
     libusb-1.0-0 \
     libzmq5-dev \
+    locales \
     ocl-icd-libopencl1 \
     ocl-icd-opencl-dev \
     opencl-headers \
-    pkg-config \
+    python-dev \
     python-pip \
+    screen \
+    sudo \
+    vim \
     wget
 
-COPY phonelibs/install_capnp.sh /tmp/install_capnp.sh
-RUN /tmp/install_capnp.sh
 
-RUN pip install --upgrade pip==18.0
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+
+ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
+RUN pyenv install 3.7.3
+RUN pyenv global 3.7.3
+RUN pyenv rehash
+
 RUN pip install pipenv==2018.11.26
 
 COPY Pipfile /tmp/
 COPY Pipfile.lock /tmp/
-RUN cd /tmp && pipenv install --deploy --system
 
-ENV PYTHONPATH /tmp/openpilot:$PYTHONPATH
+RUN python --version
+RUN cd /tmp && pipenv install --system --deploy
+
+# Install subset of dev dependencies needed for CI
+RUN pip install matplotlib==3.1.1 dictdiffer==0.8.0 fastcluster==1.1.25 aenum==2.2.1 scipy==1.3.1 lru-dict==1.1.6 tenacity==5.1.1 azure-common==1.1.23 azure-nspkg==3.0.2 azure-storage-blob==2.1.0 azure-storage-common==2.1.0 azure-storage-nspkg==3.1.0 pycurl==7.43.0.3
+
+COPY phonelibs/install_capnp.sh /tmp/install_capnp.sh
+RUN /tmp/install_capnp.sh
 
-RUN git clone --branch v0.6.2 https://github.com/commaai/openpilot-tools.git /tmp/openpilot/tools
-RUN pip install -r /tmp/openpilot/tools/requirements.txt
-RUN pip install fastcluster==1.1.20 scipy==0.19.1 dictdiffer==0.8.0 azure-batch==4.1.3 azure-common==1.1.16 azure-nspkg==3.0.0 azure-storage-blob==1.3.1 azure-storage-common==1.3.0 azure-storage-nspkg==3.0.0
+RUN git clone --branch v0.6.5 https://github.com/commaai/openpilot-tools.git /tmp/openpilot/tools
 
+ENV PYTHONPATH /tmp/openpilot:${PYTHONPATH}
 COPY ./.pylintrc /tmp/openpilot/.pylintrc
 COPY ./common /tmp/openpilot/common
 COPY ./cereal /tmp/openpilot/cereal

Pipfile

@@ -4,16 +4,16 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-ipython = "<6.0"
-aenum = "*"
-azure-batch = "==4.1.3"
-azure-common = "==1.1.16"
-azure-nspkg = "==3.0.1"
-azure-storage-blob = "==1.3.1"
-azure-storage-common = "==1.3.0"
-azure-storage-nspkg = "==3.0.0"
+opencv-python= "==3.4.2.17"
+PyQt5 = "*"
+ipython = "*"
+azure-common = "*"
+azure-nspkg = "*"
+azure-storage-blob = "*"
+azure-storage-common = "*"
+azure-storage-nspkg = "*"
 bincopy = "*"
-bleach = "==1.5.0"
+bleach = "*"
 boto = "*"
 "boto3" = "*"
 celery = "*"
@@ -23,7 +23,6 @@ decorator = "*"
 dlib = "*"
 dominate = "*"
 elasticsearch = "*"
-entium = "==0.1.4"
 fasteners = "*"
 future = "*"
 futures = "*"
@@ -32,32 +31,31 @@ pycocotools = {git = "https://github.com/cocodataset/cocoapi.git",subdirectory =
 gunicorn = "*"
 "h5py" = "*"
 hexdump = "*"
-"html5lib" = "==0.9999999"
+"html5lib" = "*"
 imageio = "*"
 intervaltree = "*"
-ipykernel = "<5.0"
+ipykernel = "*"
 joblib = "*"
 json-logging-py = "*"
 jupyter = "*"
 libarchive = "*"
 lru-dict = "*"
 lxml = "*"
-matplotlib = "==2.2.3"
 "mpld3" = "*"
 msgpack-python = "*"
 nbstripout = "*"
 nose-parameterized = "*"
-numpy = "==1.14.5"
-osmium = "==2.15.0"
-pbr = "==5.1.3"
+numpy = "*"
+osmium = "*"
+pbr = "*"
 percache = "*"
 pprofile = "*"
 psutil = "*"
 pycurl = "*"
-git-pylint-commit-hook = "==2.5.1"
+git-pylint-commit-hook = "*"
 pymongo = "*"
 "pynmea2" = "*"
-pypolyline = "==0.1.17"
+pypolyline = "*"
 pysendfile = "*"
 python-logstash = "*"
 pyvcd = "*"
@@ -68,11 +66,9 @@ scikit-image = "*"
 "subprocess32" = "*"
 supervisor = "*"
 tenacity = "*"
-tensorflow-gpu = "==1.13.0rc0"
-"transforms3d" = "*"
+tensorflow-gpu = ""
 utm = "*"
 "v4l2" = "*"
-visdom = "*"
 PyJWT = "==1.4.1"
 PyMySQL = "==0.9.2"
 Theano = "*"
@@ -81,26 +77,28 @@ Werkzeug = "*"
 Flask-Cors = "*"
 Flask-SocketIO = "*"
 "GeoAlchemy2" = "*"
-Keras = ">=2.1.6"
-keras-maskrcnn = "*"
-keras-retinanet = "*"
 Pygments = "*"
 PyNaCl = "*"
 "PySDL2" = "*"
 reverse_geocoder = "*"
 Shapely = "*"
-SQLAlchemy = "==1.2.7"
+SQLAlchemy = "*"
 uWSGI = "*"
 scipy = "*"
-fastcluster = "==1.1.25"
+fastcluster = "*"
 backports-abc = "*"
 pygame = "*"
 simplejson = "*"
 python-logstash-async = "*"
-pandas = "*"
 seaborn = "*"
-tensorflow-estimator = "==1.10.12"
+tensorflow-estimator = "*"
 pyproj = "*"
+mock = "*"
+blinker = "*"
+gast = "==0.2.2"
+matplotlib = "*"
+dictdiffer = "*"
+aenum = "*"
 
 [packages]
 overpy = {git = "https://github.com/commaai/python-overpy.git",ref = "f86529af402d4642e1faeb146671c40284007323"}
@@ -126,7 +124,7 @@ tqdm = "*"
 Cython = "*"
 PyYAML = "*"
 websocket_client = "*"
-Logentries = {git = "https://github.com/commaai/le_python.git",ref = "5eef8f5be5929d33973e1b10e686fa0cdcd6792f"}
+Logentries = {git = "https://github.com/commaai/le_python.git",ref = "feaeacb48f7f4bdb02c0a8fc092326d4e101b7f2"}
 urllib3 = "*"
 chardet = "*"
 idna = "*"
@@ -140,6 +138,7 @@ nose = "*"
 pyflakes = "*"
 pylint = "*"
 pycryptodome = "*"
+pillow = "*"
 
 [requires]
-python_version = "2.7"
+python_version = "3.7.3"