summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/alot20
-rwxr-xr-xsetup.py53
2 files changed, 23 insertions, 50 deletions
diff --git a/bin/alot b/bin/alot
deleted file mode 100755
index dfa68ead..00000000
--- a/bin/alot
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-# This file is part of alot, a terminal UI to notmuch mail (notmuchmail.org).
-# Copyright (C) 2011 Patrick Totzke <patricktotzke@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-from alot.init import main
-main()
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',
)