Hello community,
here is the log from the commit of package python-sphinxcontrib-programoutput
for openSUSE:Factory checked in at 2019-09-27 14:49:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-programoutput (Old)
and
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-programoutput.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-programoutput"
Fri Sep 27 14:49:03 2019 rev:7 rq:731432 version:0.15
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sphinxcontrib-programoutput/python-sphinxcontrib-programoutput.changes
2019-06-19 21:13:58.614836631 +0200
+++
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-programoutput.new.2352/python-sphinxcontrib-programoutput.changes
2019-09-27 14:49:05.008665684 +0200
@@ -1,0 +2,10 @@
+Mon Sep 16 11:42:03 UTC 2019 - John Vandenberg <[email protected]>
+
+- Remove tests from runtime installation
+- Update to v0.15
+ * Make the test suite stop assuming the presence of a 'python'
+ executable on the path. Instead it uses ``sys.executable``
+ (which shouldn't have spaces). Note that it does continue to
+ assume the presence of other executables, such as 'echo'
+
+-------------------------------------------------------------------
Old:
----
sphinxcontrib-programoutput-0.14.tar.gz
New:
----
sphinxcontrib-programoutput-0.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-programoutput.spec ++++++
--- /var/tmp/diff_new_pack.drUMT8/_old 2019-09-27 14:49:06.512661773 +0200
+++ /var/tmp/diff_new_pack.drUMT8/_new 2019-09-27 14:49:06.512661773 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test
Name: python-sphinxcontrib-programoutput
-Version: 0.14
+Version: 0.15
Release: 0
Summary: Sphinx extension to include program output
License: BSD-2-Clause
@@ -51,10 +51,13 @@
%install
export LANG=en_US.UTF-8
%python_install
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%{python_expand rm -r
%{buildroot}%{$python_sitelib}/sphinxcontrib/programoutput/tests/
+%fdupes %{buildroot}%{$python_sitelib}
+}
%if %{with test}
%check
+# https://github.com/NextThought/sphinxcontrib-programoutput/issues/38
export LANG=en_US.UTF-8
%python_exec setup.py test
%endif
++++++ sphinxcontrib-programoutput-0.14.tar.gz ->
sphinxcontrib-programoutput-0.15.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-programoutput-0.14/.travis.yml
new/sphinxcontrib-programoutput-0.15/.travis.yml
--- old/sphinxcontrib-programoutput-0.14/.travis.yml 2019-04-08
20:00:33.000000000 +0200
+++ new/sphinxcontrib-programoutput-0.15/.travis.yml 2019-09-16
13:37:34.000000000 +0200
@@ -1,20 +1,15 @@
group: travis_latest
language: python
+group: travis_latest
git:
depth: 1
python:
- 2.7
- 3.5
- 3.6
+ - 3.7
- pypy
- pypy3
-# As of Apr 2019, we can't use Python 3.7 at the top-level
-# without using 'dist: xenial' at the top level. But that
-# breaks PyPy and PyPy3 (they can't be installed)
-matrix:
- include:
- - python: "3.7"
- dist: xenial
env:
global:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-programoutput-0.14/CHANGES.rst
new/sphinxcontrib-programoutput-0.15/CHANGES.rst
--- old/sphinxcontrib-programoutput-0.14/CHANGES.rst 2019-04-08
20:00:33.000000000 +0200
+++ new/sphinxcontrib-programoutput-0.15/CHANGES.rst 2019-09-16
13:37:34.000000000 +0200
@@ -2,6 +2,17 @@
Changes
=========
+0.15 (2019-09-16)
+=================
+
+- Make the test suite stop assuming the presence of a 'python'
+ executable on the path. Instead it uses ``sys.executable`` (which
+ shouldn't have spaces). Note that it does continue to assume the
+ presence of other executables, such as 'echo'. Reported in `issue 38
+ <https://github.com/NextThought/sphinxcontrib-programoutput/issues/38>`_
+ by John Vandenberg.
+
+
0.14 (2019-04-08)
=================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-programoutput-0.14/PKG-INFO
new/sphinxcontrib-programoutput-0.15/PKG-INFO
--- old/sphinxcontrib-programoutput-0.14/PKG-INFO 2019-04-08
20:00:34.000000000 +0200
+++ new/sphinxcontrib-programoutput-0.15/PKG-INFO 2019-09-16
13:37:34.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: sphinxcontrib-programoutput
-Version: 0.14
+Version: 0.15
Summary: Sphinx extension to include program output
Home-page: https://sphinxcontrib-programoutput.readthedocs.org/
Author: Sebastian Wiesner
@@ -81,6 +81,17 @@
Changes
=========
+ 0.15 (2019-09-16)
+ =================
+
+ - Make the test suite stop assuming the presence of a 'python'
+ executable on the path. Instead it uses ``sys.executable`` (which
+ shouldn't have spaces). Note that it does continue to assume the
+ presence of other executables, such as 'echo'. Reported in `issue 38
+
<https://github.com/NextThought/sphinxcontrib-programoutput/issues/38>`_
+ by John Vandenberg.
+
+
0.14 (2019-04-08)
=================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-programoutput-0.14/doc/conf.py
new/sphinxcontrib-programoutput-0.15/doc/conf.py
--- old/sphinxcontrib-programoutput-0.14/doc/conf.py 2019-04-08
20:00:33.000000000 +0200
+++ new/sphinxcontrib-programoutput-0.15/doc/conf.py 2019-09-16
13:37:34.000000000 +0200
@@ -62,5 +62,5 @@
}
def setup(app):
- app.add_description_unit('confval', 'confval',
- 'pair: %s; configuration value')
+ app.add_object_type('confval', 'confval',
+ 'pair: %s; configuration value')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/__init__.py
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/__init__.py
---
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/__init__.py
2019-04-08 20:00:33.000000000 +0200
+++
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/__init__.py
2019-09-16 13:37:34.000000000 +0200
@@ -47,7 +47,7 @@
from sphinx.util import logging as sphinx_logging
-__version__ = '0.14'
+__version__ = '0.15'
logger = sphinx_logging.getLogger('contrib.programoutput')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/tests/__init__.py
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/tests/__init__.py
---
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/tests/__init__.py
2019-04-08 20:00:33.000000000 +0200
+++
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/tests/__init__.py
2019-09-16 13:37:34.000000000 +0200
@@ -194,17 +194,3 @@
return app.env.get_doctree('content/doc')
assert isinstance(AppMixin.app, Lazy) # coverage
-
-def with_content(content, **kwargs):
- def factory(f):
- def w(self):
- self.document_content = content
- if kwargs:
- if 'ignore_warnings' in kwargs:
- getattr(self, 'ignore_warnings')
- self.ignore_warnings = kwargs.pop("ignore_warnings")
- getattr(self, 'confoverrides')
- self.confoverrides = kwargs
- f(self)
- return w
- return factory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/tests/test_cache.py
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/tests/test_cache.py
---
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/tests/test_cache.py
2019-04-08 20:00:33.000000000 +0200
+++
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/tests/test_cache.py
2019-09-16 13:37:34.000000000 +0200
@@ -27,6 +27,7 @@
import os
import pickle
+import sys
import unittest
from sphinxcontrib.programoutput import ProgramOutputCache, Command
@@ -58,7 +59,7 @@
cwd = os.path.join(self.tmpdir, 'wd')
os.mkdir(cwd)
cwd = os.path.realpath(os.path.normpath(str(cwd)))
- cmd = ['python', '-c', 'import sys, os; sys.stdout.write(os.getcwd())']
+ cmd = [sys.executable, '-c', 'import sys, os;
sys.stdout.write(os.getcwd())']
self.assert_cache(cache, Command(cmd, working_directory=cwd), cwd)
@@ -73,19 +74,19 @@
def test_hidden_standard_error(self):
cache = ProgramOutputCache()
- cmd = ['python', '-c', 'import sys; sys.stderr.write("spam")']
+ cmd = [sys.executable, '-c', 'import sys; sys.stderr.write("spam")']
self.assert_cache(cache, Command(cmd, hide_standard_error=True), '')
def test_nonzero_return_code(self):
cache = ProgramOutputCache()
- cmd = ['python', '-c', 'import sys; sys.exit(1)']
+ cmd = [sys.executable, '-c', 'import sys; sys.exit(1)']
self.assert_cache(cache, Command(cmd), '', returncode=1)
def test_nonzero_return_code_shell(self):
cache = ProgramOutputCache()
- cmd = "python -c 'import sys; sys.exit(1)'"
+ cmd = sys.executable + " -c 'import sys; sys.exit(1)'"
self.assert_cache(cache, Command(cmd, shell=True), '', returncode=1)
def test_cache_pickled(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/tests/test_command.py
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/tests/test_command.py
---
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/tests/test_command.py
2019-04-08 20:00:33.000000000 +0200
+++
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/tests/test_command.py
2019-09-16 13:37:34.000000000 +0200
@@ -25,6 +25,7 @@
from __future__ import print_function, division, absolute_import
+import sys
import unittest
import tempfile
import shutil
@@ -108,14 +109,14 @@
def test_get_output_non_zero(self):
returncode, output = Command(
- 'python -c "import sys; print(\'spam\');
sys.exit(1)"').get_output()
+ sys.executable + ' -c "import sys; print(\'spam\');
sys.exit(1)"').get_output()
self.assertEqual(returncode, 1)
self.assertEqual(output, 'spam')
def test_get_output_with_hidden_standard_error(self):
returncode, output = Command(
- 'python -c "import sys; sys.stderr.write(\'spam\')"',
+ sys.executable + ' -c "import sys; sys.stderr.write(\'spam\')"',
hide_standard_error=True).get_output()
self.assertEqual(returncode, 0)
self.assertEqual(output, '')
@@ -125,7 +126,7 @@
tmpdir = tempfile.mkdtemp()
cwd = os.path.realpath(str(tmpdir))
returncode, output = Command(
- 'python -c "import sys, os; sys.stdout.write(os.getcwd())"',
+ sys.executable + ' -c "import sys, os;
sys.stdout.write(os.getcwd())"',
working_directory=cwd).get_output()
self.assertEqual(returncode, 0)
self.assertEqual(output, cwd)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/tests/test_directive.py
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/tests/test_directive.py
---
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib/programoutput/tests/test_directive.py
2019-04-08 20:00:33.000000000 +0200
+++
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib/programoutput/tests/test_directive.py
2019-09-16 13:37:34.000000000 +0200
@@ -25,6 +25,7 @@
from __future__ import print_function, division, absolute_import
+import functools
import os
import sys
import unittest
@@ -35,7 +36,31 @@
from sphinxcontrib.programoutput import Command
from . import AppMixin
-from . import with_content
+
+
+def with_content(content, **kwargs):
+ """
+ Always use a bare 'python' in the *content* string.
+
+ It will be replaced with ``sys.executable``.
+ """
+ if 'python' in content:
+ # XXX: This probably breaks if there are spaces in sys.executable.
+ content = content.replace('python', sys.executable)
+
+ def factory(f):
+ @functools.wraps(f)
+ def w(self):
+ self.document_content = content
+ if kwargs:
+ if 'ignore_warnings' in kwargs:
+ getattr(self, 'ignore_warnings')
+ self.ignore_warnings = kwargs.pop("ignore_warnings")
+ getattr(self, 'confoverrides')
+ self.confoverrides = kwargs
+ f(self)
+ return w
+ return factory
class TestDirective(AppMixin,
@@ -76,7 +101,7 @@
"""
self.assert_output(self.doctree, 'spam with eggs')
- self.assert_cache(self.app, 'python -c \'print("spam with eggs")\'',
+ self.assert_cache(self.app, sys.executable + ' -c \'print("spam with
eggs")\'',
'spam with eggs')
@@ -86,7 +111,7 @@
def test_standard_error(self):
output = 'spam with eggs'
self.assert_output(self.doctree, output)
- cmd = 'python -c \'import sys; sys.stderr.write("spam with eggs")\''
+ cmd = sys.executable + ' -c \'import sys; sys.stderr.write("spam with
eggs")\''
self.assert_cache(self.app, cmd, output)
@@ -97,7 +122,7 @@
reason="Python 3 prints version to stdout, not stderr")
def test_standard_error_disabled(self):
self.assert_output(self.doctree, '')
- self.assert_cache(self.app, 'python -V', '', hide_standard_error=True)
+ self.assert_cache(self.app, sys.executable + ' -V', '',
hide_standard_error=True)
@with_content("""\
@@ -105,7 +130,7 @@
def test_working_directory_defaults_to_srcdir(self):
output = os.path.realpath(self.srcdir)
self.assert_output(self.doctree, output)
- self.assert_cache(self.app, "python -c 'import os;
print(os.getcwd())'", output,
+ self.assert_cache(self.app, sys.executable + " -c 'import os;
print(os.getcwd())'", output,
working_directory=str(self.srcdir))
@@ -115,7 +140,7 @@
def test_working_directory_relative_to_srcdir(self):
output = os.path.realpath(self.srcdir)
self.assert_output(self.doctree, output)
- self.assert_cache(self.app, "python -c 'import os;
print(os.getcwd())'", output,
+ self.assert_cache(self.app, sys.executable + " -c 'import os;
print(os.getcwd())'", output,
working_directory=str(self.srcdir))
@@ -126,7 +151,7 @@
contentdir = os.path.join(self.srcdir, 'content')
output = os.path.realpath(contentdir)
self.assert_output(self.doctree, output)
- self.assert_cache(self.app, "python -c 'import os;
print(os.getcwd())'", output,
+ self.assert_cache(self.app, sys.executable + " -c 'import os;
print(os.getcwd())'", output,
working_directory=str(contentdir))
@@ -212,7 +237,7 @@
:ellipsis: 2""")
def test_ellipsis_stop_only(self):
self.assert_output(self.doctree, 'spam\nwith\n...')
- self.assert_cache(self.app, 'python -c
\'print("spam\\nwith\\neggs")\'',
+ self.assert_cache(self.app, sys.executable + ' -c
\'print("spam\\nwith\\neggs")\'',
'spam\nwith\neggs')
@@ -221,7 +246,8 @@
:ellipsis: -2""")
def test_ellipsis_negative_stop(self):
self.assert_output(self.doctree, 'spam\n...')
- self.assert_cache(self.app, """python -c
'print("spam\\nwith\\neggs")'""",
+ self.assert_cache(self.app,
+ sys.executable + """ -c
'print("spam\\nwith\\neggs")'""",
'spam\nwith\neggs')
@@ -230,7 +256,8 @@
:ellipsis: 1, 2""")
def test_ellipsis_start_and_stop(self):
self.assert_output(self.doctree, 'spam\n...\neggs')
- self.assert_cache(self.app, """python -c
'print("spam\\nwith\\neggs")'""",
+ self.assert_cache(self.app,
+ sys.executable + """ -c
'print("spam\\nwith\\neggs")'""",
'spam\nwith\neggs')
@@ -239,7 +266,8 @@
:ellipsis: 1, -1""")
def test_ellipsis_start_and_negative_stop(self):
self.assert_output(self.doctree, 'spam\n...\neggs')
- self.assert_cache(self.app, """python -c
'print("spam\\nwith\\neggs")'""",
+ self.assert_cache(self.app,
+ sys.executable + """ -c
'print("spam\\nwith\\neggs")'""",
'spam\nwith\neggs')
@@ -251,7 +279,7 @@
self.app.build()
self.assertIn('Unexpected return code 1 from command',
excinfo.exception.args[0])
- self.assertIn("python -c 'import sys; sys.exit(1)'",
+ self.assertIn(sys.executable + " -c 'import sys; sys.exit(1)'",
excinfo.exception.args[0])
@@ -264,7 +292,7 @@
self.app.build()
self.assertIn('Unexpected return code 1 from command',
excinfo.exception.args[0])
- self.assertIn("python -c 'import sys; sys.exit(1)'",
+ self.assertIn(sys.executable + " -c 'import sys; sys.exit(1)'",
excinfo.exception.args[0])
@with_content("""\
@@ -272,7 +300,8 @@
:returncode: 1""")
def test_expected_non_zero_return_code(self):
self.assert_output(self.doctree, 'foo')
- self.assert_cache(self.app, 'python -c \'import sys; print("foo");
sys.exit(1)\'',
+ self.assert_cache(self.app,
+ sys.executable + ' -c \'import sys; print("foo");
sys.exit(1)\'',
'foo', returncode=1)
@with_content("""\
@@ -285,8 +314,8 @@
self.assert_output(doctree, """\
> python -c 'import sys; sys.exit(1)'
-[1]>""")
- self.assert_cache(app, "python -c 'import sys; sys.exit(1)'", '',
+[1]>""".replace("python", sys.executable))
+ self.assert_cache(app, sys.executable + " -c 'import sys;
sys.exit(1)'", '',
returncode=1)
@with_content(u".. program-output:: 'spam with eggs'",
ignore_warnings=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib_programoutput.egg-info/PKG-INFO
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib_programoutput.egg-info/PKG-INFO
---
old/sphinxcontrib-programoutput-0.14/src/sphinxcontrib_programoutput.egg-info/PKG-INFO
2019-04-08 20:00:34.000000000 +0200
+++
new/sphinxcontrib-programoutput-0.15/src/sphinxcontrib_programoutput.egg-info/PKG-INFO
2019-09-16 13:37:34.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: sphinxcontrib-programoutput
-Version: 0.14
+Version: 0.15
Summary: Sphinx extension to include program output
Home-page: https://sphinxcontrib-programoutput.readthedocs.org/
Author: Sebastian Wiesner
@@ -81,6 +81,17 @@
Changes
=========
+ 0.15 (2019-09-16)
+ =================
+
+ - Make the test suite stop assuming the presence of a 'python'
+ executable on the path. Instead it uses ``sys.executable`` (which
+ shouldn't have spaces). Note that it does continue to assume the
+ presence of other executables, such as 'echo'. Reported in `issue 38
+
<https://github.com/NextThought/sphinxcontrib-programoutput/issues/38>`_
+ by John Vandenberg.
+
+
0.14 (2019-04-08)
=================
