File use-Sphinx-2.patch of Package python3-tox.29613
---
doc/conf.py | 6 +++---
tests/test_config.py | 6 ++++--
tox/_pytestplugin.py | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -45,9 +45,9 @@ intersphinx_mapping = {'https://docs.pyt
def setup(app):
# from sphinx.ext.autodoc import cut_lines
# app.connect('autodoc-process-docstring', cut_lines(4, what=['module']))
- app.add_description_unit('confval', 'confval',
- objname='configuration value',
- indextemplate='pair: %s; configuration value')
+ app.add_object_type('confval', 'confval',
+ objname='configuration value',
+ indextemplate='pair: %s; configuration value')
tls_cacerts = os.getenv('SSL_CERT_FILE') # we don't care here about the validity of certificates
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -705,8 +705,10 @@ class TestIniParser:
assert reader.getbool("key1a") is True
assert reader.getbool("key2") is False
assert reader.getbool("key2a") is False
- pytest.raises(KeyError, 'reader.getbool("key3")')
- pytest.raises(tox.exception.ConfigError, 'reader.getbool("key5")')
+ with pytest.raises(KeyError):
+ reader.getbool("key3")
+ with pytest.raises(tox.exception.ConfigError):
+ reader.getbool("key5")
class TestIniParserPrefix:
--- a/tox/_pytestplugin.py
+++ b/tox/_pytestplugin.py
@@ -77,7 +77,7 @@ class ReportExpectMock:
def generic_report(*args, **kwargs):
self._calls.append((name,) + args)
- print("%s" % (self._calls[-1], ))
+ print("%s" % (str(self._calls[-1]), ))
return generic_report
def action(self, venv, msg, *args):