travis: move everything into pipenv, update to python 3.6

.travis.yml

@@ -4,16 +4,21 @@ language: c
 
 addons:
   apt:
+    sources:
+      - deadsnakes
     packages:
       - build-essential
       - gcc-arm-none-eabi
+      - gcc-multilib
       - libnewlib-arm-none-eabi
-      - python3-pip
+      - python3.6
+      - python3.6-venv
+      - python3.6-dev
 
 env:
   global:
     - MAKEFLAGS=-j2
-    - PYTHON=python3
+    - PYTHON=python3.6
     - PROTOBUF_VERSION=3.4.0
   matrix:
     - DEBUG_LINK=0
@@ -21,39 +26,24 @@ env:
 
 matrix:
   include:
-    - addons:
-        apt:
-          packages:
-            - gcc-multilib
-            - python3-pip
       env:
         - EMULATOR=1 HEADLESS=1
         - DEBUG_LINK=1
-      before_script:
-        - $PYTHON -m pip install --user pipenv
-        - pipenv install
       script:
-        # use outer environment (with protobuf & ecdsa) to build,
-        # then use pipenv to run tests
-        - ./script/cibuild && pipenv run script/test
-
-# using two "separate" python environments is somewhat unwieldy, and it would be nicer
-# to consolidate everything into one.
-# Unfortunately, installing pipenv and fetching python-trezor from git takes about one minute.
-# For now, we keep the envs separate. If the number of "outer" modules grows significantly,
-# they should probably be moved into pipenv.
+        - pipenv run ./script/cibuild && pipenv run script/test
 
 install:
   - curl -LO "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip"
   - unzip "protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" -d protoc
   - export PATH="$(pwd)/protoc/bin:$PATH"
-  - $PYTHON -m pip install --user "protobuf==${PROTOBUF_VERSION}"
-  - $PYTHON -m pip install --user ecdsa  # for firmware_sign
+  - $PYTHON -m ensurepip --user
+  - $PYTHON -m pip install --user pipenv
+  - pipenv install
 
 script:
-  - script/cibuild
-  - make -C bootloader
-  - make -C demo
+  - pipenv run script/cibuild
+  - pipenv run make -C bootloader
+  - pipenv run make -C demo
 
 notifications:
   webhooks:

Pipfile

@@ -10,3 +10,5 @@ pytest = "*"
 mock = "*"
 typing = "*"
 protobuf = "==3.4.0"
+mako = "*"
+munch = "*"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "495d8a64b9cfa1479cf756fc05dddbf8ca34a12186478ee46a7fa8aba140e0cb"
+            "sha256": "0c77aa21c1e385d7c3833a2f95bc6129394f6d9ce67e1181700a76a5e15074cb"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -65,9 +65,22 @@
         },
         "libusb1": {
             "hashes": [
-                "sha256:8c930d9c1d037d9c83924c82608aa6a1adcaa01ca0e4a23ee0e8e18d7eee670d"
+                "sha256:4707f81e933a97fed1c5bf7d4957f07bae1139cb8084bdee1f50201a40e3fd7c"
             ],
-            "version": "==1.6.4"
+            "version": "==1.6.5"
+        },
+        "mako": {
+            "hashes": [
+                "sha256:4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"
+            ],
+            "index": "pypi",
+            "version": "==1.0.7"
+        },
+        "markupsafe": {
+            "hashes": [
+                "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"
+            ],
+            "version": "==1.0"
         },
         "mnemonic": {
             "hashes": [
@@ -91,6 +104,13 @@
             ],
             "version": "==4.2.0"
         },
+        "munch": {
+            "hashes": [
+                "sha256:6ae3d26b837feacf732fb8aa5b842130da1daf221f5af9f9d4b2a0a6414b0d51"
+            ],
+            "index": "pypi",
+            "version": "==2.3.2"
+        },
         "pbkdf2": {
             "hashes": [
                 "sha256:ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979"
@@ -99,23 +119,22 @@
         },
         "pbr": {
             "hashes": [
-                "sha256:4f2b11d95917af76e936811be8361b2b19616e5ef3b55956a429ec7864378e0c",
-                "sha256:e0f23b61ec42473723b2fec2f33fb12558ff221ee551962f01dd4de9053c2055"
+                "sha256:1b8be50d938c9bb75d0eaf7eda111eec1bf6dc88a62a6412e33bf077457e0f45",
+                "sha256:b486975c0cafb6beeb50ca0e17ba047647f229087bd74e37f4a7e2cac17d2caa"
             ],
-            "version": "==4.1.0"
+            "version": "==4.2.0"
         },
         "pluggy": {
             "hashes": [
-                "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff",
-                "sha256:d345c8fe681115900d6da8d048ba67c25df42973bda370783cd58826442dcd7c",
-                "sha256:e160a7fcf25762bb60efc7e171d4497ff1d8d2d75a3d0df7a21b76821ecbf5c5"
+                "sha256:6e3836e39f4d36ae72840833db137f7b7d35105079aee6ec4a62d9f80d594dd1",
+                "sha256:95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1"
             ],
-            "version": "==0.6.0"
+            "markers": "python_version != '3.2.*' and python_version != '3.1.*' and python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.3.*'",
+            "version": "==0.7.1"
         },
         "protobuf": {
             "hashes": [
                 "sha256:1fcb9b704bc2e30767352d86b2664d8f65f8ed49654d7a80e7a150739724e80a",
-                "sha256:36d871fa54ec039b9153e7cbae1fa52a7cfdcd8105e47fb7efc8292b131d0a5c",
                 "sha256:41c4555d9754b985352ce5289fa3ba6b21ed715f595111e46e2b90ca53112475",
                 "sha256:4d4815467f8a61b06d648699842b233017b201f7a16275d680ec5480f10e30e9",
                 "sha256:5b816951df388f4ab2adbd3f9ae5619b9a5d7033d14b005c345dc3ee88a7faf4",
@@ -149,11 +168,11 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:0453c8676c2bee6feb0434748b068d5510273a916295fd61d306c4f22fbfd752",
-                "sha256:4b208614ae6d98195430ad6bde03641c78553acee7c83cec2e85d613c0cd383d"
+                "sha256:341ec10361b64a24accaec3c7ba5f7d5ee1ca4cebea30f76fad3dd12db9f0541",
+                "sha256:952c0389db115437f966c4c2079ae9d54714b9455190e56acebe14e8c38a7efa"
             ],
             "index": "pypi",
-            "version": "==3.6.3"
+            "version": "==3.6.4"
         },
         "requests": {
             "hashes": [