From b061ca7746a9f623a423785efd763696cc4cb315 Mon Sep 17 00:00:00 2001 From: keepkeyjon Date: Fri, 16 Nov 2018 12:39:09 -0700 Subject: [PATCH] Partial fix for #25 - remove hidraw --- keepkeylib/transport_hid.py | 5 +---- setup.py | 9 ++++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/keepkeylib/transport_hid.py b/keepkeylib/transport_hid.py index f6a733a3..7229bb58 100644 --- a/keepkeylib/transport_hid.py +++ b/keepkeylib/transport_hid.py @@ -7,10 +7,7 @@ from u2flib_host import hid_transport as u2fhid_transport import platform -if platform.system() == 'Linux': - import hidraw as hid -else: - import hid +import hid u2fhid_transport.DEVICES.append((0x2b24, 0x0001)) #KeepKey diff --git a/setup.py b/setup.py index 84f035e5..b338b261 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,14 @@ ], scripts = ['keepkeyctl'], test_suite='tests/**/test_*.py', - install_requires=['ecdsa>=0.9', 'protobuf>=3.0.0', 'mnemonic>=0.8', 'hidapi>=0.7.99.post15', 'python-u2flib-host>=3.0.3', 'hidraw>=0.1'], + install_requires=[ + 'ecdsa>=0.9', + 'protobuf>=3.0.0', + 'mnemonic>=0.8', + 'hidapi>=0.7.99.post15', + 'python-u2flib-host>=3.0.3', + 'timeout-decorator>=0.4.0' + ], include_package_data=True, zip_safe=False, classifiers=[