From 72cc0fc801fc4df60cc23e6818580a91e76f4f18 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Fri, 5 Jun 2020 14:03:24 -0700
Subject: [PATCH] use pipenv for dev dependencies

---
 tools/README.md        | 129 -----------------------------------------
 tools/requirements.txt |  13 -----
 tools/ubuntu_setup.sh  |   8 +--
 3 files changed, 1 insertion(+), 149 deletions(-)
 delete mode 100644 tools/requirements.txt

diff --git a/tools/README.md b/tools/README.md
index ea0fd7d83..badec0210 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -28,135 +28,6 @@ openpilot tools and the following setup steps are developed and tested on Ubuntu
 
 Setup
 ============
-<!--
-TODO: These instructions maybe outdated, follow ubuntu_setup.sh setup instructions
-
-1. Install native dependencies (Mac and Ubuntu sections listed below)
-
-    **Ubuntu**
-
-    - core tools
-      ```bash
-      sudo apt install git curl python-pip
-      sudo pip install --upgrade pip>=18.0 pipenv
-      ```
-
-    - ffmpeg (tested with 3.3.2)
-      ```bash
-      sudo apt install ffmpeg libavformat-dev libavcodec-dev libavdevice-dev libavutil-dev libswscale-dev libavresample-dev libavfilter-dev
-      ```
-
-    - build tools
-      ```bash
-      sudo apt install autoconf automake clang clang-3.8 libtool pkg-config build-essential
-      ```
-
-    - libarchive-dev (tested with 3.1.2-11ubuntu0.16.04.4)
-      ```bash
-      sudo apt install libarchive-dev
-      ```
-
-    - qt python binding (tested with python-qt4, 4.11.4+dfsg-1build4)
-      ```bash
-      sudo apt install python-qt4
-      ```
-
-    - zmq 4.2.3 (required for replay)
-      ```bash
-      curl -LO https://github.com/zeromq/libzmq/releases/download/v4.2.3/zeromq-4.2.3.tar.gz
-      tar xfz zeromq-4.2.3.tar.gz
-      cd zeromq-4.2.3
-      ./autogen.sh
-      ./configure CPPFLAGS=-DPIC CFLAGS=-fPIC CXXFLAGS=-fPIC LDFLAGS=-fPIC --disable-shared --enable-static
-      make
-      sudo make install
-      ```
-
-    **Mac**
-
-    - brew
-      ``` bash
-      /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-      ```
-
-    - core tools
-      ``` bash
-      brew install git
-      sudo pip install --upgrade pip pipenv
-      xcode-select --install
-      ```
-
-    - ffmpeg (tested with 3.4.1)
-        ```bash
-        brew install ffmpeg
-        ```
-
-    - build tools
-        ```bash
-        brew install autoconf automake libtool llvm pkg-config
-        ```
-
-    - libarchive-dev (tested with 3.3.3)
-        ```bash
-        brew install libarchive
-        ```
-
-    - qt for Mac
-        ```bash
-        brew install qt
-        ```
-
-    - zmq 4.3.1 (required for replay)
-        ```bash
-        brew install zeromq
-        ```
-
-2. Install Cap'n Proto
-
-    ```bash
-    curl -O https://capnproto.org/capnproto-c++-0.6.1.tar.gz
-    tar xvf capnproto-c++-0.6.1.tar.gz
-    cd capnproto-c++-0.6.1
-    ./configure --prefix=/usr/local CPPFLAGS=-DPIC CFLAGS=-fPIC CXXFLAGS=-fPIC LDFLAGS=-fPIC --disable-shared --enable-static
-    make -j4
-    sudo make install
-    ```
-
-2. Clone openpilot if you haven't already
-
-    ```bash
-    git clone https://github.com/commaai/openpilot.git
-    cd openpilot
-    pipenv install # Install dependencies in a virtualenv
-    pipenv shell # Activate the virtualenv
-    ```
-
-    **For Mac users**
-
-    Recompile longitudinal_mpc for mac
-
-    Navigate to:
-    ``` bash
-    cd selfdrive/controls/lib/longitudinal_mpc
-    make clean
-    make
-    ```
-
-3. Install tools dependencies
-
-    ```bash
-    cd tools
-    pip install -r requirements.txt # Install tools dependencies in virtualenv
-    ```
-
-4. Add openpilot to your `PYTHONPATH`.
-
-    For bash users:
-    ```bash
-    echo 'export PYTHONPATH="$PYTHONPATH:<path-to-openpilot>"' >> ~/.bashrc
-    source ~/.bashrc
-    ```
--->
 1. Run ubuntu_setup.sh, make sure everything completed correctly
 
 2. Compile openpilot by running ```scons``` in the openpilot directory
diff --git a/tools/requirements.txt b/tools/requirements.txt
deleted file mode 100644
index d5887cb5e..000000000
--- a/tools/requirements.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-aenum
-atomicwrites
-futures
-libarchive
-lru-dict
-matplotlib
-numpy
-opencv-python
-pygame
-hexdump
-pycurl
-tenacity
-av==0.5.0
diff --git a/tools/ubuntu_setup.sh b/tools/ubuntu_setup.sh
index 9d3abc799..e46d7b29f 100755
--- a/tools/ubuntu_setup.sh
+++ b/tools/ubuntu_setup.sh
@@ -85,13 +85,7 @@ pyenv rehash
 pip install pipenv==2018.11.26
 
 # pipenv setup (in openpilot dir)
-pipenv install --system --deploy
-
-# to make tools work
-pip install -r tools/requirements.txt
-
-# to make modeld work on PC with nvidia GPU
-pip install tensorflow==2.2
+pipenv install --dev --system --deploy
 
 # for loggerd to work on ubuntu
 # TODO: PC should log somewhere else