Merge remote-tracking branch 'upstream/master' into clean

[electrum-nvc.git] / setup.py

diff --git a/setup.py b/setup.py
index ce590f6..238efd0 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 # python setup.py sdist --format=zip,gztar
 
-from distutils.core import setup
+from setuptools import setup
 import os, sys, platform, imp
 
 version = imp.load_source('version', 'lib/version.py')
@@ -49,54 +49,62 @@ data_files += [
 
 setup(name = "Electrum",
     version = version.ELECTRUM_VERSION,
-    install_requires = ['slowaes','ecdsa'],
+    install_requires = ['slowaes','ecdsa>=0.9'],
     package_dir = {'electrum': 'lib', 'electrum_gui': 'gui', 'electrum_plugins':'plugins'},
     scripts= ['electrum'],
     data_files = data_files,
-    py_modules = ['electrum.version',
-                  'electrum.wallet',
-                  'electrum.wallet_bitkey',
-                  'electrum.wallet_factory',
-                  'electrum.interface',
+    py_modules = ['electrum.account',
+                  'electrum.bitcoin',
                   'electrum.blockchain',
                   'electrum.commands',
+                  'electrum.interface',
                   'electrum.mnemonic',
+                  'electrum.msqr',
+                  'electrum.network',
                   'electrum.simple_config',
                   'electrum.socks',
-                  'electrum.msqr',
+                  'electrum.transaction',
                   'electrum.util',
-                  'electrum.account',
-                  'electrum.bitcoin',
-                  'electrum.deserialize',
+                  'electrum.version',
                   'electrum.verifier',
-                  'electrum_gui.gui_gtk',
-                  'electrum_gui.qt_console',
-                  'electrum_gui.gui_classic',
-                  'electrum_gui.gui_lite',
-                  'electrum_gui.gui_text',
-                  'electrum_gui.exchange_rate',
-                  'electrum_gui.icons_rc',
-                  'electrum_gui.pyqrnative',
-                  'electrum_gui.qrcodewidget',
-                  'electrum_gui.history_widget',
-                  'electrum_gui.receiving_widget',
-                  'electrum_gui.qt_util',
-                  'electrum_gui.network_dialog',
-                  'electrum_gui.bmp',
-                  'electrum_gui.i18n',
-                  'electrum_gui.plugins',
-                  'electrum_gui.amountedit',
-                  'electrum_plugins.pointofsale',
-                  'electrum_plugins.qrscanner',
+                  'electrum.wallet',
+                  'electrum.wallet_bitkey',
+                  'electrum.wallet_factory',
+                  'electrum.bmp',
+                  'electrum.i18n',
+                  'electrum.pyqrnative',
+                  'electrum.plugins',
+                  'electrum_gui.gtk',
+                  'electrum_gui.text',
+                  'electrum_gui.qt.__init__',
+                  'electrum_gui.qt.amountedit',
+                  'electrum_gui.qt.console',
+                  'electrum_gui.qt.history_widget',
+                  'electrum_gui.qt.installwizard',
+                  'electrum_gui.qt.icons_rc',
+                  'electrum_gui.qt.lite_window',
+                  'electrum_gui.qt.main_window',
+                  'electrum_gui.qt.network_dialog',
+                  'electrum_gui.qt.password_dialog',
+                  'electrum_gui.qt.qrcodewidget',
+                  'electrum_gui.qt.receiving_widget',
+                  'electrum_gui.qt.seed_dialog',
+                  'electrum_gui.qt.transaction_dialog',
+                  'electrum_gui.qt.util',
+                  'electrum_gui.qt.version_getter',
+                  'electrum_gui.stdio',
                   'electrum_plugins.aliases',
+                  'electrum_plugins.exchange_rate',
                   'electrum_plugins.labels',
+                  'electrum_plugins.pointofsale',
+                  'electrum_plugins.qrscanner',
                   'electrum_plugins.virtualkeyboard',
                   ],
     description = "Lightweight Bitcoin Wallet",
     author = "ecdsa",
     author_email = "ecdsa@github",
     license = "GNU GPLv3",
-    url = "http://electrum-desktop.com",
+    url = "http://electrum.org",
     long_description = """Lightweight Bitcoin Wallet""" 
 )