Merge tag '0.28.2'

notmuch 0.28.2 release

diff --git a/NEWS b/NEWS
index d46035cd080d121b40f0d60e9731586f34041bd7..2a69b0be5206bf8d59b0057d53888999dd84a4b6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,20 @@ Command Line Interface
 `notmuch show` now supports --body=false and --include-html with
 --format=text
 
+Notmuch 0.28.2 (2019-02-17)
+===========================
+
+Emacs
+-----
+
+Invoke gpg with --batch and --no-tty.
+
+Python Bindings
+---------------
+
+Fix documentation build with Python 3.7. Note that Python >= 3.3 is
+now needed to build this documentation.
+
 Notmuch 0.28.1 (2019-02-01)
 ===========================
 

diff --git a/bindings/python/docs/source/conf.py b/bindings/python/docs/source/conf.py
index 5b901c4ec4d82e18ed3a406a8dd7915e34668422..8b43c5ca3f9f1d019c49bf2ac3146186e14c828a 100644 (file)
--- a/bindings/python/docs/source/conf.py
+++ b/bindings/python/docs/source/conf.py
@@ -13,22 +13,13 @@
 
 import sys, os
 
+from unittest.mock import Mock
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0,os.path.abspath('../..'))
 
-class Mock(object):
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def __call__(self, *args, **kwargs):
-        return Mock()
-
-    @classmethod
-    def __getattr__(self, name):
-        return Mock() if name not in ('__file__', '__path__') else '/dev/null'
-
 MOCK_MODULES = [
     'ctypes',
 ]

diff --git a/bindings/python/docs/source/filesystem.rst b/bindings/python/docs/source/filesystem.rst
index 558c93de592af64be4c15839cf541a6d1f95fa4d..13fe11946c464eb63e1e06f0ac82b38d0551f0fa 100644 (file)
--- a/bindings/python/docs/source/filesystem.rst
+++ b/bindings/python/docs/source/filesystem.rst
@@ -15,7 +15,7 @@ Files and directories
       instead.
 
 :class:`Directory` -- A directory entry in the database
-------------------------------------------------------
+-------------------------------------------------------
 
 .. autoclass:: Directory
 

diff --git a/bindings/python/docs/source/threads.rst b/bindings/python/docs/source/threads.rst
index 4324ac82a389611d8a633c65f015dabb7c4d4aa0..46ce5be5412a5ed3430000e1a6fdc06bdf6eab2a 100644 (file)
--- a/bindings/python/docs/source/threads.rst
+++ b/bindings/python/docs/source/threads.rst
@@ -11,4 +11,4 @@
       iterator and broke list(Threads()). Use `len(list(msgs))`
       instead.
 
-.. automethod:: __str__
+   .. automethod:: __str__

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 7cc4db187bd7e46dccaf6065281cf9ddb27ca40b..f376f6e6fad630944a7b1d23f6c56f50fbe92786 100644 (file)
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.28.1'
+__VERSION__ = '0.28.2'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index fce3e5f345e067899be8d407b68e329bb2153668..9ed2547e10f4f19be7317f6b24c17e06b8538762 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.28.2-1) unstable; urgency=medium
+
+  * [notmuch-emacs] Invoke gpg from with --batch and --no-tty
+
+ -- David Bremner <bremner@debian.org>  Sun, 17 Feb 2019 07:30:33 -0400
+
 notmuch (0.28.1-1) unstable; urgency=medium
 
   * New upstream bug fix release

diff --git a/version b/version
index 48f7a71df4beb09d86a9e249e41dfff11d606e40..a37255a85b9f006788bc34d9f098a5235c3e36a2 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.28.1
+0.28.2