Merge branch 'master' into python3

Conflicts: setup.py
2016-05-07 21:14:20 +03:00
parent 68637525ea 695079e4b9
commit ad8eafe6f8
10 changed files with 74 additions and 139 deletions
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,8 @@ setup(
    author='Roman Zeyde',
    author_email='roman.zeyde@gmail.com',
    url='http://github.com/romanz/trezor-agent',
-    packages=['trezor_agent'],
+    packages=['trezor_agent', 'trezor_agent.gpg'],
+    scripts=['trezor_agent/gpg/trezor-git-gpg-wrapper.sh'],
    install_requires=['ecdsa>=0.13', 'ed25519>=1.4', 'Cython>=0.23.4', 'protobuf>=3.0.0b2.post2', 'trezor>=0.6.12', 'semver>=2.2'],
    platforms=['POSIX'],
    classifiers=[