arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-25 17:09:44 +00:00
Code Issues Releases Wiki Activity

style: update requirements, isort call arguments

Browse Source
This commit is contained in:
matejcik 2019-05-07 16:17:53 +02:00
parent cf5df6b39b
commit af82fe1d8e
4 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Pipfile
View File

@ -5,7 +5,7 @@ verify_ssl = true
[packages] [packages]
# all # all
trezor = {editable = true, path = "./python"} trezor = {editable = true,path = "./python"}
scons = "*" scons = "*"
protobuf = "==3.4.0" protobuf = "==3.4.0"
pyblake2 = "*" pyblake2 = "*"
@ -13,11 +13,12 @@ pyblake2 = "*"
pytest = "*" pytest = "*"
mock = "*" mock = "*"
## style ## style
isort = "*" isort = ">=4.3.14"
flake8 = "*" flake8 = "*"
black = "*" black = "*"
mako = ">=1.0.7" mako = ">=1.0.7"
munch = ">=2.3.2" munch = ">=2.3.2"
autoflake = "*"
# common # common
demjson = "*" demjson = "*"
@ -36,7 +37,7 @@ pyasn1 = "*"
# core # core
## monero ## monero
monero_agent = {version = ">=2.0.1", extras = ["tcry", "dev"]} monero_agent = {version = ">=2.0.1",extras = ["tcry", "dev"]}
py_trezor_crypto_ph4 = {version = ">=0.1.1"} py_trezor_crypto_ph4 = {version = ">=0.1.1"}
# legacy # legacy

62
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "4c4b090a727ea8f5db592444bf5930bb9ec06898d5b58d7c4eba4fd9a1317ebb" "sha256": "6d760f8c930394d2b132cf47d7781497b85e8422b00ad2b064725b9390e27695"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": {}, "requires": {},
@ -56,6 +56,13 @@
], ],
"version": "==19.1.0" "version": "==19.1.0"
}, },
"autoflake": {
"hashes": [
"sha256:6b59e5b9b82e30077499578856282debb81186d10b4f899e8c2e1d616cdef973"
],
"index": "pypi",
"version": "==1.3"
},
"black": { "black": {
"hashes": [ "hashes": [
"sha256:09a9dcb7c46ed496a9850b76e4e825d6049ecd38b611f1224857a79bd985a8cf", "sha256:09a9dcb7c46ed496a9850b76e4e825d6049ecd38b611f1224857a79bd985a8cf",
@ -231,12 +238,12 @@
}, },
"hypothesis": { "hypothesis": {
"hashes": [ "hashes": [
"sha256:4e1378aec40b109f2212f8416a0ef27635b40fdc22a7a8116cd5527776ce1f9e", "sha256:4ba81ea07ce2b301892512dcdf6953623dec0e0d154ca3e48c40315a4bebe8be",
"sha256:63d33b2394410ab09a05a19354d826e2aa7814288b0800eb5e89857181def40a", "sha256:4ef64defa59be8ecd3d5472a9b12f613b1679da42ff5efe183e3171b4e500708",
"sha256:905395b9da7fe04e5ce32b41eace83b613586a104db4b4b0a2552db980a40dd2" "sha256:7ce4ae1d94cbfc27b161b4ff9129916ab146ce8d8b30c1bab40c99579a0f042f"
], ],
"index": "pypi", "index": "pypi",
"version": "==4.18.0" "version": "==4.22.0"
}, },
"idna": { "idna": {
"hashes": [ "hashes": [
@ -245,6 +252,13 @@
], ],
"version": "==2.8" "version": "==2.8"
}, },
"importlib-metadata": {
"hashes": [
"sha256:46fc60c34b6ed7547e2a723fc8de6dc2e3a1173f8423246b3ce497f064e9c3de",
"sha256:bc136180e961875af88b1ab85b4009f4f1278f8396a60526c0009f503a1a96ca"
],
"version": "==0.9"
},
"inform": { "inform": {
"hashes": [ "hashes": [
"sha256:9fa86429435552ecba03eeae34fb2864049b16ad59ac888cb125e49f9ad36632" "sha256:9fa86429435552ecba03eeae34fb2864049b16ad59ac888cb125e49f9ad36632"
@ -253,11 +267,11 @@
}, },
"isort": { "isort": {
"hashes": [ "hashes": [
"sha256:01cb7e1ca5e6c5b3f235f0385057f70558b70d2f00320208825fa62887292f43", "sha256:1349c6f7c2a0f7539f5f2ace51a9a8e4a37086ce4de6f78f5f53fb041d0a3cd5",
"sha256:268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a" "sha256:f09911f6eb114e5592abe635aded8bf3d2c3144ebcfcaf81ee32e7af7b7d1870"
], ],
"index": "pypi", "index": "pypi",
"version": "==4.3.17" "version": "==4.3.18"
}, },
"libusb1": { "libusb1": {
"hashes": [ "hashes": [
@ -320,11 +334,11 @@
}, },
"mock": { "mock": {
"hashes": [ "hashes": [
"sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1", "sha256:21a2c07af3bbc4a77f9d14ac18fcc1782e8e7ea363df718740cdeaf61995b5e7",
"sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba" "sha256:7868db2825a1563578869d4a011a036503a2f1d60f9ff9dd1e3205cd6e25fcec"
], ],
"index": "pypi", "index": "pypi",
"version": "==2.0.0" "version": "==3.0.4"
}, },
"monero-agent": { "monero-agent": {
"extras": [ "extras": [
@ -379,13 +393,6 @@
], ],
"version": "==1.3" "version": "==1.3"
}, },
"pbr": {
"hashes": [
"sha256:6901995b9b686cb90cceba67a0f6d4d14ae003cd59bc12beb61549bdfbe3bc89",
"sha256:d950c64aeea5456bbd147468382a5bb77fe692c13c9f00f0219814ce5b642755"
],
"version": "==5.2.0"
},
"pep8": { "pep8": {
"hashes": [ "hashes": [
"sha256:b22cfae5db09833bb9bd7c8463b53e1a9c9b39f12e304a8d0bba729c501827ee", "sha256:b22cfae5db09833bb9bd7c8463b53e1a9c9b39f12e304a8d0bba729c501827ee",
@ -427,10 +434,10 @@
}, },
"pluggy": { "pluggy": {
"hashes": [ "hashes": [
"sha256:19ecf9ce9db2fce065a7a0586e07cfb4ac8614fe96edf628a264b1c70116cf8f", "sha256:1c0b297d4d41bc9bdfbdc17991b35f9e1d2cfe8eaa4d7c118e86d705870d34c8",
"sha256:84d306a647cc805219916e62aab89caa97a33a1dd8c342e87a37f91073cd4746" "sha256:fb2f776b7ec85038ef95860f4e83bfb6ab171a9d0b70b69d7ca4d04130644c2b"
], ],
"version": "==0.9.0" "version": "==0.10.0"
}, },
"ply": { "ply": {
"hashes": [ "hashes": [
@ -650,10 +657,10 @@
}, },
"urllib3": { "urllib3": {
"hashes": [ "hashes": [
"sha256:4c291ca23bbb55c76518905869ef34bdd5f0e46af7afe6861e8375643ffee1a0", "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4",
"sha256:9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3" "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"
], ],
"version": "==1.24.2" "version": "==1.24.3"
}, },
"virtualenv": { "virtualenv": {
"hashes": [ "hashes": [
@ -668,6 +675,13 @@
"sha256:8eb4a788b3aec8abf5ff68d4165441bc57420c9f64ca5f471f58c3969fe08668" "sha256:8eb4a788b3aec8abf5ff68d4165441bc57420c9f64ca5f471f58c3969fe08668"
], ],
"version": "==0.33.1" "version": "==0.33.1"
},
"zipp": {
"hashes": [
"sha256:139391b239594fd8b91d856bc530fbd2df0892b17dd8d98a91f018715954185f",
"sha256:8047e4575ce8d700370a3301bbfc972896a5845eb62dd535da395b86be95dfad"
],
"version": "==0.4.0"
} }
}, },
"develop": { "develop": {

6
python/Makefile
View File

@ -3,7 +3,7 @@ SETUP=$(PYTHON) setup.py
EXCLUDES=.vscode EXCLUDES=.vscode
STYLE_TARGETS=trezorlib trezorctl setup.py STYLE_TARGETS=trezorlib trezorctl setup.py
EXCLUDE_TARGETS=trezorlib/messages EXCLUDE_TARGETS=messages
all: build all: build
@ -47,12 +47,12 @@ git-clean:
style: style:
black $(STYLE_TARGETS) black $(STYLE_TARGETS)
isort --apply --recursive $(STYLE_TARGETS) --skip-glob "*/$(EXCLUDE_TARGETS)/*" isort --apply --recursive $(STYLE_TARGETS) --skip-glob "$(EXCLUDE_TARGETS)/*"
autoflake -i --remove-all-unused-imports -r $(STYLE_TARGETS) --exclude "$(EXCLUDE_TARGETS)" autoflake -i --remove-all-unused-imports -r $(STYLE_TARGETS) --exclude "$(EXCLUDE_TARGETS)"
style_check: style_check:
black --check $(STYLE_TARGETS) black --check $(STYLE_TARGETS)
isort --diff --check-only --recursive $(STYLE_TARGETS) --skip-glob "*/$(EXCLUDE_TARGETS)/*" isort --check-only --recursive $(STYLE_TARGETS) --skip-glob "$(EXCLUDE_TARGETS)/*"
flake8 flake8
.PHONY: all build install clean style style_check git-clean clean-generated clean-build clean-pyc clean-test .PHONY: all build install clean style style_check git-clean clean-generated clean-build clean-pyc clean-test

2
python/requirements-dev.txt
View File

@ -3,6 +3,6 @@
pytest>=3.6 pytest>=3.6
flake8 flake8
protobuf protobuf
isort==4.3.10 isort>=4.3.14
black; python_version >= "3.6" black; python_version >= "3.6"
autoflake>=1.2 autoflake>=1.2