summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2016-11-30 02:30:44 -0500
committerDylan Baker <dylan@pnwbakers.com>2017-08-14 09:30:34 -0700
commitb0e2f322aa571a5e1999c069779f589e282a566c (patch)
treed5b905ff596a045ef4c8e5c9540772218b026230 /docs
parentc377ee5bd6e2b64be8bbdd5df72ac3ca50373134 (diff)
convert from pygpgme to the python "gpg" module
This converts from the now abandoned pygpgme project for wrapping gpgme, to the upstream gpgme python bindings (which are descended from the pyme project, before they became official). Largely this change should not be user visible, but there are a couple cases where the new bindings provide slightly more detailed error messages, and alot directly presents those messages to users. This patch has been significantly revised and updated by Dylan Baker, but was originally authored by Daniel Kahn Gillmor. Fixes #1069
Diffstat (limited to 'docs')
-rw-r--r--docs/source/conf.py2
-rw-r--r--docs/source/installation.rst6
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5ebab550..e096cc89 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -33,7 +33,7 @@ MOCK_MODULES = ['twisted', 'twisted.internet',
'urwid',
'urwidtrees',
'magic',
- 'gpgme',
+ 'gpg',
'configobj',
'validate',
'argparse']
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index 2110315b..170c384b 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -13,7 +13,7 @@ A full list of dependencies is below:
* `libnotmuch <http://notmuchmail.org/>`_ and it's python bindings, ≥ `0.13`
* `urwid <http://excess.org/urwid/>`_ toolkit, ≥ `1.1.0`
* `urwidtrees <https://github.com/pazz/urwidtrees>`_, ≥ `1.0`
-* `PyGPGME <https://launchpad.net/pygpgme>`_ ≥ `0.2`
+* `gpg <https://pypi.python.org/pypi/gpg>`_
.. note:: urwidtrees was only recently detached from alot and is not widely
available as a separate package. You can install it e.g., via
@@ -26,11 +26,11 @@ A full list of dependencies is below:
On debian/ubuntu the rest are packaged as::
- python-setuptools 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-gpg
On fedora/redhat these are packaged as::
- python-setuptools python-magic python-configobj python-twisted python-notmuch python-urwid pygpgme
+ python-setuptools python-magic python-configobj python-twisted python-notmuch python-urwid python-gpg
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