switch to setuptools

* use entrypoint to generate executable
* find_packages() automatically includes all modules
* requires -> install_requires (remove argparse and subprocess, argparse
  is included in Python 2.7, subprocess had some missing functionality
  before 2.7)

Conflicts:
	setup.py

1 files changed, 23 insertions, 30 deletions

diff --git a/setup.py b/setup.py
index a6effb5e..6cd0e30b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup, find_packages
 import alot
 
 
@@ -11,34 +11,27 @@ setup(name='alot',
       author_email=alot.__author_email__,
       url=alot.__url__,
       license=alot.__copyright__,
-      packages=[
-          'alot',
-          'alot.commands',
-          'alot.settings',
-          'alot.db',
-          'alot.utils',
-          'alot.widgets',
-          ],
-      package_data={
-          'alot': [
-              'defaults/alot.rc.spec',
-              'defaults/notmuch.rc.spec',
-              'defaults/abook_contacts.spec',
-              'defaults/default.theme',
-              'defaults/default.bindings',
-              'defaults/config.stub',
-              'defaults/theme.spec',
-              ]},
-      scripts=['bin/alot'],
-      requires=[
-          'notmuch (>=0.13)',
-          'argparse (>=2.7)',
-          'urwid (>=1.1.0)',
-          'urwidtrees (>=1.0)',
-          'twisted (>=10.2.0)',
-          'magic',
-          'configobj (>=4.6.0)',
-          'subprocess (>=2.7)',
-          'gpgme (>=0.2)'],
+      packages=find_packages(),
+      package_data={'alot': [
+                             'defaults/alot.rc.spec',
+                             'defaults/notmuch.rc.spec',
+                             'defaults/abook_contacts.spec',
+                             'defaults/default.theme',
+                             'defaults/default.bindings',
+                             'defaults/config.stub',
+                             'defaults/theme.spec',
+                            ]},
+      entry_points={
+          'console_scripts':
+              ['alot = alot.init:main'],
+      },
+      install_requires=[
+        'notmuch>=0.13',
+        'urwid>=1.1.0',
+        'urwidtrees (>=1.0)',
+        'twisted>=10.2.0',
+        'python-magic',
+        'configobj>=4.6.0',
+        'pygpgme>=0.2'],
       provides='alot',
       )