Merge pull request #1005 from kevcooper/master

Added electrum-env to use a virtualenv for python dependencies
2015-02-04 11:55:22 +01:00
parent 8982a463a4 f928c565c4
commit de5bc0ceaf
2 changed files with 25 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@@ -69,8 +69,8 @@ setup(
        'ecdsa>=0.9',
        'pbkdf2',
        'requests',
-        'pyasn1',
        'pyasn1-modules',
+        'pyasn1',
        'qrcode',
        'SocksiPy-branch',
        'protobuf',