This repository has been archived by the owner on Jun 5, 2019. It is now read-only.
use trezor-common as a submodule #248
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matejcik
force-pushed
the
matejcik/with-trezor-common
branch
3 times, most recently
from
a3ed6b1 to
c9e4574
Compare
|
Looks great! ACK 12ea96a |
This enforces presence of the trezor-common submodule, copies coins.json to the package directory (from where we can install it with bdist) and if possible, regenerates protobuf messages. That currently doesn't work on Windows, because it's a shell script. Also it relies on presence of `protoc` protobuf compiler. Therefore the regeneration step is optional and converted protobuf messages should still be commited to this repo. coins.json, OTOH, is gitignored in trezorlib, and must be copied from trezor-common every time. This works because sdist includes the vendor directory.
This way, if the process fails, the files in trezorlib/messages remain untouched. This is important because "setup.py build" now runs the build_protobuf tool, and it can easily fail on a system without protoc.
also exclude vendor subdir over which we possibly don't have control
this removes some unused variables and also catches a couple bugs
matejcik
force-pushed
the
matejcik/with-trezor-common
branch
from
12ea96a to
928498c
Compare
|
🎉 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
trezor-commonas part ofsetup.py. This falls back to in-tree versions ifbuild_protobuffails, e.g. if you don't haveprotocor are on Windows where shell scripts don't workcoins.jsonfrom trezor-common as part of the packagecoins.jsonincoins.pyinstead of static dictionariesalso flake8 is better and stricter here