From a94ea094a0261e6ccb66898df143556201b2bce7 Mon Sep 17 00:00:00 2001 From: matejcik Date: Mon, 9 Jul 2018 17:12:26 +0200 Subject: [PATCH] travis: install protobuf compiler and add modules to Pipfile --- .travis.yml | 12 +++++++++--- Pipfile | 1 + Pipfile.lock | 52 +++++++++++++++++++++++++++++++++------------------- 3 files changed, 43 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index c39805563..ca3a5dcf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,12 @@ compiler: - gcc env: - - GOAL=stm32 TOOLCHAIN_SHORTVER=7-2017q4 TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2017-q4-major - - GOAL=unix - - GOAL=src + global: + - PROTOBUF_VERSION=3.4.0 + matrix: + - GOAL=stm32 TOOLCHAIN_SHORTVER=7-2017q4 TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2017-q4-major + - GOAL=unix + - GOAL=src matrix: exclude: @@ -32,6 +35,9 @@ before_install: - pip3 install --user pipenv 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" - pipenv install before_script: diff --git a/Pipfile b/Pipfile index b80914aa5..cee3ae52d 100644 --- a/Pipfile +++ b/Pipfile @@ -7,3 +7,4 @@ verify_ssl = true trezor = {git = "https://github.com/trezor/python-trezor", editable = true, ref = "master"} pytest = "*" mock = "*" +protobuf = "==3.4.0" diff --git a/Pipfile.lock b/Pipfile.lock index 1c1dc2c68..f24387425 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "8d814b6b0f2a426cc6dc971a35b1b230c3c96d4400710363a58e80ef2f77410f" + "sha256": "b4eae29eaeaf82e3804fd1c8bf192feeadd4c2c6e6de3f647e999c0c915ada66" }, "pipfile-spec": 6, "requires": {}, @@ -58,10 +58,10 @@ }, "idna": { "hashes": [ - "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f", - "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4" + "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", + "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" ], - "version": "==2.6" + "version": "==2.7" }, "libusb1": { "hashes": [ @@ -99,10 +99,10 @@ }, "pbr": { "hashes": [ - "sha256:680bf5ba9b28dd56e08eb7c267991a37c7a5f90a92c2e07108829931a50ff80a", - "sha256:6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5" + "sha256:4f2b11d95917af76e936811be8361b2b19616e5ef3b55956a429ec7864378e0c", + "sha256:e0f23b61ec42473723b2fec2f33fb12558ff221ee551962f01dd4de9053c2055" ], - "version": "==4.0.3" + "version": "==4.1.0" }, "pluggy": { "hashes": [ @@ -112,12 +112,26 @@ ], "version": "==0.6.0" }, + "protobuf": { + "hashes": [ + "sha256:1fcb9b704bc2e30767352d86b2664d8f65f8ed49654d7a80e7a150739724e80a", + "sha256:36d871fa54ec039b9153e7cbae1fa52a7cfdcd8105e47fb7efc8292b131d0a5c", + "sha256:41c4555d9754b985352ce5289fa3ba6b21ed715f595111e46e2b90ca53112475", + "sha256:4d4815467f8a61b06d648699842b233017b201f7a16275d680ec5480f10e30e9", + "sha256:5b816951df388f4ab2adbd3f9ae5619b9a5d7033d14b005c345dc3ee88a7faf4", + "sha256:61dbf86993a9312c3a0816b5252079a3943856003bf0380fea3098c929084ad4", + "sha256:9f3be25ad48b051186ee88f9567a3f3f548facd360e0cb62568e2736d9cfda11", + "sha256:ef02609ef445987976a3a26bff77119c518e0915c96661c3a3b17856d0ef6374" + ], + "index": "pypi", + "version": "==3.4.0" + }, "py": { "hashes": [ - "sha256:29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881", - "sha256:983f77f3331356039fdd792e9220b7b8ee1aa6bd2b25f567a963ff1de5a64f6a" + "sha256:3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7", + "sha256:e31fb2767eb657cbde86c454f02e99cb846d3cd9d61b318525140214fdc0e98e" ], - "version": "==1.5.3" + "version": "==1.5.4" }, "pyblake2": { "hashes": [ @@ -135,18 +149,18 @@ }, "pytest": { "hashes": [ - "sha256:39555d023af3200d004d09e51b4dd9fdd828baa863cded3fd6ba2f29f757ae2d", - "sha256:c76e93f3145a44812955e8d46cdd302d8a45fbfc7bf22be24fe231f9d8d8853a" + "sha256:0453c8676c2bee6feb0434748b068d5510273a916295fd61d306c4f22fbfd752", + "sha256:4b208614ae6d98195430ad6bde03641c78553acee7c83cec2e85d613c0cd383d" ], "index": "pypi", - "version": "==3.6.0" + "version": "==3.6.3" }, "requests": { "hashes": [ - "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b", - "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e" + "sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1", + "sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a" ], - "version": "==2.18.4" + "version": "==2.19.1" }, "six": { "hashes": [ @@ -170,10 +184,10 @@ }, "urllib3": { "hashes": [ - "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b", - "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f" + "sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf", + "sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5" ], - "version": "==1.22" + "version": "==1.23" } }, "develop": {}