From 947f64592f7ef740b3041d59652a422a32802e82 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 23 Sep 2011 22:07:48 +0200 Subject: [PATCH 1/2] Post-release updates. --- CHANGES | 4 ++++ sphinx/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 6fb83f404..fc7f1861f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +Release 1.0.9 (in development) +============================== + + Release 1.0.8 (Sep 23, 2011) ============================ diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 0875c59c2..6b6af595b 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -12,7 +12,7 @@ import sys from os import path -__version__ = '1.0.8' +__version__ = '1.0.8+' __released__ = '1.0.8' # used when Sphinx builds its own docs package_dir = path.abspath(path.dirname(__file__)) From 452a41ba8a001f58b3f96c5ed99f0f929af7e19c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 25 Sep 2011 08:37:35 +0200 Subject: [PATCH 2/2] Fix tests in the face of docutils 0.6. --- tests/test_build_html.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_build_html.py b/tests/test_build_html.py index 93aa41d41..77808f88d 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -40,7 +40,8 @@ http://www.python.org/logo.png %(root)s/includes.txt:\\d*: WARNING: Encoding 'utf-8-sig' used for \ reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \ :encoding: option\\n? -%(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png +(%(root)s/includes.txt|None):4: WARNING: download file not readable: \ +nonexisting.png %(root)s/objects.txt:\\d*: WARNING: using old C markup; please migrate to \ new-style markup \(e.g. c:function instead of cfunction\), see \ http://sphinx.pocoo.org/domains.html