From 5e7e491308b1d6556aa2399769ee6bf58ef94407 Mon Sep 17 00:00:00 2001 From: matejcik Date: Tue, 3 Jul 2018 18:14:58 +0200 Subject: [PATCH] travis: fix build problems * remove "in-tree vs generated" check as there is no in-tree anymore * add protobuf to requirements-dev * use requirements-dev in tox travis: do not diff generated against (missing) in-tree messages travis: in tox env, use requirements-dev --- .travis.yml | 2 -- requirements-dev.txt | 1 + tox.ini | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57264da624..7e79071fbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,8 +41,6 @@ before_script: - ./trigger-travis.sh script: - # check that generated protobuf messages are identical to in-tree ones - - ./tools/build_protobuf messages.tmp && diff -ur messages.tmp trezorlib/messages && rm -r messages.tmp - python setup.py install - flake8 - tox diff --git a/requirements-dev.txt b/requirements-dev.txt index 3d0892c8ca..8341bcbdb2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,3 +3,4 @@ pytest>=3.5.0 mock>=2.0.0 flake8 +protobuf diff --git a/tox.ini b/tox.ini index d2578fd9ab..a60d278054 100644 --- a/tox.ini +++ b/tox.ini @@ -7,9 +7,7 @@ envlist = [testenv] deps = - -rrequirements.txt - pytest - mock + -rrequirements-dev.txt commands = python -m compileall trezorlib/ python trezorctl --help