1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00

vendor: remove python-trezor submodule for now

This commit is contained in:
Pavol Rusnak 2017-12-18 21:38:31 +01:00
parent b92a0d24b0
commit bb1c42b16c
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 9 additions and 8 deletions

3
.gitmodules vendored
View File

@ -13,6 +13,3 @@
[submodule "vendor/nanopb"] [submodule "vendor/nanopb"]
path = vendor/nanopb path = vendor/nanopb
url = https://github.com/nanopb/nanopb.git url = https://github.com/nanopb/nanopb.git
[submodule "python-trezor"]
path = vendor/python-trezor
url = https://github.com/trezor/python-trezor.git

View File

@ -29,9 +29,10 @@ matrix:
- EMULATOR=1 HEADLESS=1 - EMULATOR=1 HEADLESS=1
- DEBUG_LINK=1 - DEBUG_LINK=1
before_script: before_script:
- sed -i '/hidapi/d' "vendor/python-trezor/requirements.txt" - pip install --user pytest
- pip install --user --requirement "vendor/python-trezor/requirements.txt" rlp pytest requests[security] - pip install --user ecdsa mnemonic
- pip install --user --no-deps "vendor/python-trezor" - pip install --user rlp requests[security]
- pip install --user --no-deps git+https://github.com/trezor/python-trezor@master
script: script:
- script/cibuild - script/cibuild
- script/test - script/test

View File

@ -6,6 +6,10 @@ set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
if [ \! -d device_tests ]; then
curl -s -L https://github.com/trezor/python-trezor/archive/master.tar.gz | tar -xvz --strip-components=2 python-trezor-master/tests/device_tests
fi
# Kill jobs on exit # Kill jobs on exit
trap "exit" INT TERM trap "exit" INT TERM
trap "kill 0" EXIT trap "kill 0" EXIT
@ -14,7 +18,7 @@ if [ "$EMULATOR" = 1 ] && [ -z "$(pidof trezor.elf)" ]; then
firmware/trezor.elf & firmware/trezor.elf &
fi fi
TREZOR_TRANSPORT_V1=1 pytest "vendor/python-trezor/tests/device_tests" & TREZOR_TRANSPORT_V1=1 pytest "device_tests" &
# Wait for either job to exit and kill the other # Wait for either job to exit and kill the other
wait -n wait -n

@ -1 +0,0 @@
Subproject commit 90c49e3386ee9391c2a57e2ca0a40f8a909a47cc