Merge branch '0.3.6-packaging-setuptools-709'

pazz · Mar 2, 2015 · 9fb019d · 9fb019d
2 parents 4975885 + 8df1bcd
commit 9fb019d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,13 @@
 *.py[co]
 *.log
 *.swp
+*.egg-info/
+/bin
 /build
 /dist
+/include
+/lib
+/lib64
 /MANIFEST
 .gdb_history
 docs/build

diff --git a/bin/alot b/bin/alot
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -8,19 +8,19 @@ on argparse and subprocess, you need to run *`3.0` > python ≥ `2.7`* (see :ref
 A full list of dependencies is below:
 
 * `libmagic and python bindings <http://darwinsys.com/file/>`_, ≥ `5.04`:
-* `configobj <http://www.voidspace.org.uk/python/configobj.html>`_, ≥ `4.6.0`:
+* `configobj <http://www.voidspace.org.uk/python/configobj.html>`_, ≥ `4.7.0`:
 * `twisted <http://twistedmatrix.com/trac/>`_, ≥ `10.2.0`:
-* `libnotmuch <http://notmuchmail.org/>`_ and it's python bindings, ≥ `0.12`.
+* `libnotmuch <http://notmuchmail.org/>`_ and it's python bindings, ≥ `0.13`.
 * `urwid <http://excess.org/urwid/>`_ toolkit, ≥ `1.1.0`
 * `PyGPGME <https://launchpad.net/pygpgme>`_ ≥ `0.2`
 
 On debian/ubuntu these are packaged as::
 
-  python-magic python-configobj python-twisted python-notmuch python-urwid python-gpgme
+  python-setuptools python-magic python-configobj python-twisted python-notmuch python-urwid python-gpgme
 
 On fedora/redhat these are packaged as::
 
-  python-magic python-configobj python-twisted python-notmuch python-urwid pygpgme
+  python-setuptools python-magic python-configobj python-twisted python-notmuch python-urwid pygpgme
 
 Alot uses `mailcap <http://en.wikipedia.org/wiki/Mailcap>`_ to look up mime-handler for inline
 rendering and opening of attachments.  For a full description of the maicap protocol consider the
@@ -32,17 +32,21 @@ renderer (copiousoutput) set up for `text/html`, i.e. have something like this i
 
 .. rubric:: get and install alot
 
-Grab a `tarball here <https://github.com/pazz/alot/tags>`_ or
-directly check out a more recent version from `github <https://github.com/pazz/alot>`_.::
+You can use `pip` to install directly from GitHub::
 
-  git clone git@github.com:pazz/alot.git
+  $ pip install --user https://github.com/pazz/alot/archive/master.zip
 
-Run the :file:`setup.py` with the :option:`--user` flag to install locally::
+Or check out a more recent version, e.g. the master branch::
+
+  $ pip install --user https://github.com/pazz/alot/archive/master.zip
+
+Don't have pip installed? Just download and extract, then run::
 
   python setup.py install --user
 
-and make sure :file:`~/.local/bin` is in your :envvar:`PATH`.
-For system-wide installation omit this falg and call with the respective permissions.
+Make sure :file:`~/.local/bin` is in your :envvar:`PATH`. For system-wide
+installation omit the :option:`--user` flag and call with the respective
+permissions.
 
 .. rubric:: generate manual and manpage
 

diff --git 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 @@
       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.7.0',
+        'pygpgme>=0.2'],
       provides='alot',
       )