tMerge pull request #1005 from kevcooper/master - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit de5bc0ceaf633272a797b6dbb8050eff976dcc56 DIR parent 8982a463a4ceaecfd328c4f3751ca77b19b8cd17 HTML Author: ThomasV <electrumdev@gmail.com> Date: Wed, 4 Feb 2015 11:55:22 +0100 Merge pull request #1005 from kevcooper/master Added electrum-env to use a virtualenv for python dependencies Diffstat: A electrum-env | 24 ++++++++++++++++++++++++ M setup.py | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) --- DIR diff --git a/electrum-env b/electrum-env t@@ -0,0 +1,24 @@ +#!/bin/bash +# +# This script creates a virtualenv named 'env' and installs all +# python dependencies before activating the env and running Electrum. +# If 'env' already exists, it is activated and Electrum is started +# without any installations. Additionally, the PYTHONPATH environment +# variable is set properly before running Electrum. +# +# python-qt and its dependencies will still need to be installed with +# your package manager. + +if [ -e ./env/bin/activate ]; then + source ./env/bin/activate +else + virtualenv env + source ./env/bin/activate + python setup.py install +fi + +export PYTHONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH + +./electrum + +deactivate DIR diff --git a/setup.py b/setup.py t@@ -69,8 +69,8 @@ setup( 'ecdsa>=0.9', 'pbkdf2', 'requests', - 'pyasn1', 'pyasn1-modules', + 'pyasn1', 'qrcode', 'SocksiPy-branch', 'protobuf',