From 510dc8c8377e4fef1e96c13c2ea3f25f4b51c889 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 11 Feb 2019 20:22:35 +0200 Subject: [PATCH 1/6] python: fix documentation build with python 3.7 The simplistic mocking in conf.py falls short on python 3.7. Just use unittest.mock instead. Fixes: Traceback (most recent call last): File "/usr/lib/python3/dist-packages/sphinx/config.py", line 368, in eval_config_file execfile_(filename, namespace) File "/usr/lib/python3/dist-packages/sphinx/util/pycompat.py", line 150, in execfile_ exec_(code, _globals) File "/path/to/notmuch/bindings/python/docs/source/conf.py", line 39, in from notmuch import __VERSION__,__AUTHOR__ File "/path/to/notmuch/bindings/python/notmuch/__init__.py", line 54, in from .database import Database File "/path/to/notmuch/bindings/python/notmuch/database.py", line 25, in from .globals import ( File "/path/to/notmuch/bindings/python/notmuch/globals.py", line 48, in class NotmuchDatabaseS(Structure): TypeError: __mro_entries__ must return a tuple --- bindings/python/docs/source/conf.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/bindings/python/docs/source/conf.py b/bindings/python/docs/source/conf.py index 5b901c4e..8b43c5ca 100644 --- 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', ] From 528e5ba2c8a6a8585a3508dee549b2880dfca671 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 11 Feb 2019 20:22:36 +0200 Subject: [PATCH 2/6] python: fix documentation title underline Fix documentation build sphinx warning: filesystem.rst:18: WARNING: Title underline too short. --- bindings/python/docs/source/filesystem.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/docs/source/filesystem.rst b/bindings/python/docs/source/filesystem.rst index 558c93de..13fe1194 100644 --- 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 From 0888639489dcde2b60e425d76842a4970e444cf6 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 11 Feb 2019 20:22:37 +0200 Subject: [PATCH 3/6] python: fix threads.__str__ automethod documentation Indent the directive properly to attach it to Threads autoclass documentation. Fixes: WARNING: don't know which module to import for autodocumenting '__str__' (try placing a "module" or "currentmodule" directive in the document, or giving an explicit module name) --- bindings/python/docs/source/threads.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/docs/source/threads.rst b/bindings/python/docs/source/threads.rst index 4324ac82..46ce5be5 100644 --- 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__ From 9e3f64d15139fba9a633b9cc9b8244d5cd5afaf1 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Feb 2019 07:28:15 -0400 Subject: [PATCH 4/6] NEWS for 0.28.2 --- NEWS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/NEWS b/NEWS index 7de5ea7f..e469ba06 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +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) =========================== From d057824889073a6aa17ea1bd16455a75248ce53f Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Feb 2019 07:31:16 -0400 Subject: [PATCH 5/6] debian: changelog for 0.28.2-1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index fce3e5f3..9ed2547e 100644 --- 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 Sun, 17 Feb 2019 07:30:33 -0400 + notmuch (0.28.1-1) unstable; urgency=medium * New upstream bug fix release From af0ff260cc1cb1c8ff0e5e353fd92ca4a1f2bc3f Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Feb 2019 07:32:59 -0400 Subject: [PATCH 6/6] bump version --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 7cc4db18..f376f6e6 100644 --- 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/version b/version index 48f7a71d..a37255a8 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.28.1 +0.28.2