Bug#918309: [PKG-Openstack-devel] Bug#918309: sphinxcontrib-programoutput: Please update to v0.13 that is compatible with Sphinx 1.8

2019-03-10 Thread Thomas Goirand 
On 3/9/19 11:32 PM, Chris Lamb wrote:
> tags 918309 + pending patch
> thanks
> 
> I've uploaded sphinxcontrib-programoutput 0.11-3.1 to DELAYED/5:
>   
>   sphinxcontrib-programoutput (0.11-3.1) unstable; urgency=medium
>   
> * Non-maintainer upload.
> * Fix FTBFS with Sphinx 1.8 by backporting patch from upstream.
>   (Closes: #918309)
> 
> The full debdiff is attached.
> 
> 
> Regards,

Hi Chris,

Thanks for this. Uploading directly without delay was very much fine.
You can do that if you have spare time.

Cheers,

Thomas Goirand (zigo)

Bug#918309: sphinxcontrib-programoutput: Please update to v0.13 that is compatible with Sphinx 1.8

2019-03-09 Thread Chris Lamb 
tags 918309 + pending patch
thanks

I've uploaded sphinxcontrib-programoutput 0.11-3.1 to DELAYED/5:
  
  sphinxcontrib-programoutput (0.11-3.1) unstable; urgency=medium
  
* Non-maintainer upload.
* Fix FTBFS with Sphinx 1.8 by backporting patch from upstream.
  (Closes: #918309)

The full debdiff is attached.


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-
diffstat for sphinxcontrib-programoutput-0.11 sphinxcontrib-programoutput-0.11

 changelog  |8 ++
 patches/fix-tests-for-sphinx-1.8.patch |   38 +
 patches/series |1 
 3 files changed, 47 insertions(+)

diff -Nru sphinxcontrib-programoutput-0.11/debian/changelog 
sphinxcontrib-programoutput-0.11/debian/changelog
--- sphinxcontrib-programoutput-0.11/debian/changelog   2018-01-21 
14:01:43.0 +
+++ sphinxcontrib-programoutput-0.11/debian/changelog   2019-03-09 
22:26:13.0 +
@@ -1,3 +1,11 @@
+sphinxcontrib-programoutput (0.11-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with Sphinx 1.8 by backporting patch from upstream.
+(Closes: #918309)
+
+ -- Chris Lamb   Sat, 09 Mar 2019 22:26:13 +
+
 sphinxcontrib-programoutput (0.11-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru 
sphinxcontrib-programoutput-0.11/debian/patches/fix-tests-for-sphinx-1.8.patch 
sphinxcontrib-programoutput-0.11/debian/patches/fix-tests-for-sphinx-1.8.patch
--- 
sphinxcontrib-programoutput-0.11/debian/patches/fix-tests-for-sphinx-1.8.patch  
1970-01-01 01:00:00.0 +0100
+++ 
sphinxcontrib-programoutput-0.11/debian/patches/fix-tests-for-sphinx-1.8.patch  
2019-03-09 22:23:04.0 +
@@ -0,0 +1,38 @@
+--- 
sphinxcontrib-programoutput-0.11.orig/src/sphinxcontrib/programoutput/tests/__init__.py
 
sphinxcontrib-programoutput-0.11/src/sphinxcontrib/programoutput/tests/__init__.py
+@@ -3,7 +3,7 @@ import os.path
+ import shutil
+ import tempfile
+ 
+-from docutils.parsers.rst import directives
++from docutils.parsers.rst import directives, roles
+ from sphinx.application import Sphinx
+ 
+ from functools import update_wrapper
+@@ -60,9 +60,12 @@ class AppMixin(object):
+ # sphinxcontrib.programoutput: directive u'program-output' is
+ # already registered, it will be overridden".
+ self.directives = directives._directives.copy()
++# Likewise for 'eq'
++self.roles = roles._roles.copy()
+ 
+ def tearDown(self):
+ directives._directives = self.directives
++roles._roles = self.roles
+ 
+ @Lazy
+ def tmpdir(self):
+--- 
sphinxcontrib-programoutput-0.11.orig/src/sphinxcontrib/programoutput/__init__.py
 
sphinxcontrib-programoutput-0.11/src/sphinxcontrib/programoutput/__init__.py
+@@ -218,6 +218,11 @@ def run_programs(app, doctree):
+ error_message = 'Command {0} failed: {1}'.format(command, error)
+ error_node = doctree.reporter.error(error_message, base_node=node)
+ node.replace_self(error_node)
++# Sphinx 1.8.0b1 started dropping all system_message nodes with a
++# level less than 5 by default (or 2 if `keep_warnings` is set to 
true).
++# This appears to be undocumented. Reporting failures is an 
important
++# part of what this extension does, so we raise the default level.
++error_node['level'] = 6
+ else:
+ if returncode != node['returncode']:
+ app.warn('Unexpected return code {0} from command {1}'.format(
diff -Nru sphinxcontrib-programoutput-0.11/debian/patches/series 
sphinxcontrib-programoutput-0.11/debian/patches/series
--- sphinxcontrib-programoutput-0.11/debian/patches/series  2017-11-18 
13:19:22.0 +
+++ sphinxcontrib-programoutput-0.11/debian/patches/series  2019-03-09 
22:26:13.0 +
@@ -1 +1,2 @@
 remove-failing-tests-when-LANG-equal-C.patch
+fix-tests-for-sphinx-1.8.patch

Bug#918309: sphinxcontrib-programoutput: Please update to v0.13 that is compatible with Sphinx 1.8

2019-03-09 Thread Chris Lamb 
tags 918309 + patch
thanks

Patch attached.


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-
diff --git a/src/sphinxcontrib/programoutput/__init__.py 
b/src/sphinxcontrib/programoutput/__init__.py
index 7eb1c5d..824c045 100644
--- a/src/sphinxcontrib/programoutput/__init__.py
+++ b/src/sphinxcontrib/programoutput/__init__.py
@@ -218,6 +218,11 @@ def run_programs(app, doctree):
 error_message = 'Command {0} failed: {1}'.format(command, error)
 error_node = doctree.reporter.error(error_message, base_node=node)
 node.replace_self(error_node)
+# Sphinx 1.8.0b1 started dropping all system_message nodes with a
+# level less than 5 by default (or 2 if `keep_warnings` is set to 
true).
+# This appears to be undocumented. Reporting failures is an 
important
+# part of what this extension does, so we raise the default level.
+error_node['level'] = 6
 else:
 if returncode != node['returncode']:
 app.warn('Unexpected return code {0} from command {1}'.format(
diff --git a/src/sphinxcontrib/programoutput/tests/__init__.py 
b/src/sphinxcontrib/programoutput/tests/__init__.py
index 7547962..1e19120 100644
--- a/src/sphinxcontrib/programoutput/tests/__init__.py
+++ b/src/sphinxcontrib/programoutput/tests/__init__.py
@@ -3,7 +3,7 @@ import os.path
 import shutil
 import tempfile
 
-from docutils.parsers.rst import directives
+from docutils.parsers.rst import directives, roles
 from sphinx.application import Sphinx
 
 from functools import update_wrapper
@@ -60,9 +60,12 @@ class AppMixin(object):
 # sphinxcontrib.programoutput: directive u'program-output' is
 # already registered, it will be overridden".
 self.directives = directives._directives.copy()
+# Likewise for 'eq'
+self.roles = roles._roles.copy()
 
 def tearDown(self):
 directives._directives = self.directives
+roles._roles = self.roles
 
 @Lazy
 def tmpdir(self):

Bug#918309: sphinxcontrib-programoutput: Please update to v0.13 that is compatible with Sphinx 1.8

2019-01-04 Thread Dmitry Shachnev 
Source: sphinxcontrib-programoutput
Version: 0.11-3
Severity: important
User: python-modules-t...@lists.alioth.debian.org
Usertags: sphinx1.8

Dear maintainer,

Currently sphinxcontrib-programoutput fails to build against Sphinx 1.8,
which is available in experimental.

Please update to the latest upstream release, 0.13, which is compatible
with new Sphinx.

See this upstream pull request for details:
https://github.com/NextThought/sphinxcontrib-programoutput/pull/31

--
Dmitry Shachnev


signature.asc
Description: PGP signature