[Patch v3 4/4] doc: automatically read version from file

diff --git a/c2/bb394e8d45a40ba7858d88b2f5a8d7e76fba77 b/c2/bb394e8d45a40ba7858d88b2f5a8d7e76fba77
new file mode 100644 (file)
index 0000000..cb9010d
--- /dev/null
+++ b/c2/bb394e8d45a40ba7858d88b2f5a8d7e76fba77
@@ -0,0 +1,80 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7B5A7431FC7\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 05:57:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id mcLKAUyJonm5 for <notmuch@notmuchmail.org>;\r
+       Sun,  9 Mar 2014 05:57:20 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B0D7A431FBF\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 05:57:19 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WMdI7-0003qO-Ax; Sun, 09 Mar 2014 09:57:19 -0300\r
+Received: (nullmailer pid 8489 invoked by uid 1000); Sun, 09 Mar 2014\r
+       12:57:08 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 4/4] doc: automatically read version from file\r
+Date: Sun,  9 Mar 2014 09:57:00 -0300\r
+Message-Id: <1394369820-8319-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394369820-8319-1-git-send-email-david@tethera.net>\r
+References: <1394369820-8319-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 09 Mar 2014 12:57:25 -0000\r
+\r
+This avoids having to recreate the update-man-versions rule\r
+---\r
+ doc/conf.py | 12 +++++++++---\r
+ 1 file changed, 9 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/doc/conf.py b/doc/conf.py\r
+index 6c2806d..a926fe4 100644\r
+--- a/doc/conf.py\r
++++ b/doc/conf.py\r
+@@ -14,10 +14,16 @@ master_doc = 'index'\r
+ project = u'notmuch'\r
+ copyright = u'2014, Carl Worth and many others'\r
+ \r
+-# The short X.Y version.\r
+-version = '0.17'\r
++location = os.path.dirname(__file__)\r
++\r
++for pathdir in ['.', '..']:\r
++    version_file = os.path.join(location,pathdir,'version')\r
++    if os.path.exists(version_file):\r
++        with open(version_file,'r') as infile:\r
++            version=infile.read().replace('\n','')\r
++\r
+ # The full version, including alpha/beta/rc tags.\r
+-release = '0.17'\r
++release = version\r
+ \r
+ # List of patterns, relative to source directory, that match files and\r
+ # directories to ignore when looking for source files.\r
+-- \r
+1.8.5.3\r
+\r