Hello community,
here is the log from the commit of package python-sphinxcontrib-trio for
openSUSE:Factory checked in at 2019-06-18 14:47:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-trio (Old)
and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-trio.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-trio"
Tue Jun 18 14:47:22 2019 rev:5 rq:708151 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sphinxcontrib-trio/python-sphinxcontrib-trio.changes
2019-04-26 22:43:21.433677051 +0200
+++
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-trio.new.4811/python-sphinxcontrib-trio.changes
2019-06-18 14:47:27.145711396 +0200
@@ -1,0 +2,6 @@
+Thu Jun 6 13:38:19 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Update to 1.1.0:
+ * Support for new sphinx
+
+-------------------------------------------------------------------
Old:
----
sphinxcontrib-trio-1.0.2.tar.gz
New:
----
sphinxcontrib-trio-1.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-trio.spec ++++++
--- /var/tmp/diff_new_pack.3KvhxS/_old 2019-06-18 14:47:28.165711182 +0200
+++ /var/tmp/diff_new_pack.3KvhxS/_new 2019-06-18 14:47:28.165711182 +0200
@@ -19,7 +19,7 @@
%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-sphinxcontrib-trio
-Version: 1.0.2
+Version: 1.1.0
Release: 0
Summary: Sphinx extension for documenting Python functions and methods
License: MIT OR Apache-2.0
++++++ sphinxcontrib-trio-1.0.2.tar.gz -> sphinxcontrib-trio-1.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-trio-1.0.2/MANIFEST.in
new/sphinxcontrib-trio-1.1.0/MANIFEST.in
--- old/sphinxcontrib-trio-1.0.2/MANIFEST.in 2017-05-13 09:22:08.000000000
+0200
+++ new/sphinxcontrib-trio-1.1.0/MANIFEST.in 2019-06-03 09:54:54.000000000
+0200
@@ -1,6 +1,6 @@
include LICENSE LICENSE.MIT LICENSE.APACHE2
include README.rst CODE_OF_CONDUCT.md
-include test-requirements.txt
+include test-requirements.in test-requirements.txt
recursive-include docs *
recursive-include tests *
prune docs/build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-trio-1.0.2/PKG-INFO
new/sphinxcontrib-trio-1.1.0/PKG-INFO
--- old/sphinxcontrib-trio-1.0.2/PKG-INFO 2019-01-28 04:45:56.000000000
+0100
+++ new/sphinxcontrib-trio-1.1.0/PKG-INFO 2019-06-03 09:56:52.000000000
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: sphinxcontrib-trio
-Version: 1.0.2
+Version: 1.1.0
Summary: Make Sphinx better at documenting Python functions and methods
Home-page: https://github.com/python-trio/sphinxcontrib-trio
Author: Nathaniel J. Smith
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-trio-1.0.2/docs/source/index.rst
new/sphinxcontrib-trio-1.1.0/docs/source/index.rst
--- old/sphinxcontrib-trio-1.0.2/docs/source/index.rst 2019-01-28
04:27:50.000000000 +0100
+++ new/sphinxcontrib-trio-1.1.0/docs/source/index.rst 2019-06-03
09:55:51.000000000 +0200
@@ -118,9 +118,13 @@
* functions that have an attribute ``__returns_contextmanager__``
with a truthy value.
-* ``:async-with:`` is autodetected for functions that have an
- attribute ``__returns_acontextmanager__`` (note the ``a``) with a
- truthy value.
+* ``:async-with:`` is autodetected for:
+
+ * functions decorated with `contextlib.asynccontextmanager
+
<https://docs.python.org/3/library/contextlib.html#contextlib.asynccontextmanager>`__,
+
+ * functions that have an attribute ``__returns_acontextmanager__``
+ (note the ``a``) with a truthy value.
* ``:for:`` is autodetected for generators.
@@ -294,6 +298,21 @@
.. towncrier release notes start
+Sphinxcontrib_Trio 1.1.0 (2019-06-03)
++++++++++++++++++++++++++++++++++++++
+
+Features
+~~~~~~~~
+
+- Added support for Sphinx 2.1. (`#23
<https://github.com/python-trio/sphinxcontrib-trio/issues/23>`__)
+
+
+Deprecations and Removals
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Drop support for Sphinx 1.6 and earlier. (`#87
<https://github.com/python-trio/sphinxcontrib-trio/issues/87>`__)
+
+
Sphinxcontrib_Trio 1.0.2 (2019-01-27)
+++++++++++++++++++++++++++++++++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-trio-1.0.2/setup.py
new/sphinxcontrib-trio-1.1.0/setup.py
--- old/sphinxcontrib-trio-1.0.2/setup.py 2018-08-06 04:17:13.000000000
+0200
+++ new/sphinxcontrib-trio-1.1.0/setup.py 2019-06-03 06:13:46.000000000
+0200
@@ -17,7 +17,7 @@
license="MIT -or- Apache License 2.0",
packages=find_packages(),
url="https://github.com/python-trio/sphinxcontrib-trio";,
- install_requires=["sphinx"],
+ install_requires=["sphinx >= 1.7"],
classifiers=[
'Development Status :: 5 - Production/Stable',
"Intended Audience :: Developers",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio/__init__.py
new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio/__init__.py
--- old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio/__init__.py 2019-01-28
04:24:35.000000000 +0100
+++ new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio/__init__.py 2019-06-03
09:54:41.000000000 +0200
@@ -63,18 +63,8 @@
from sphinx import addnodes
from sphinx.domains.python import PyModulelevel, PyClassmember
from sphinx.ext.autodoc import (
- FunctionDocumenter, MethodDocumenter, ClassLevelDocumenter, Options,
+ FunctionDocumenter, MethodDocumenter, ClassLevelDocumenter, Options,
ModuleLevelDocumenter
)
-# In Sphinx versions prior to 1.7, this module would blow away some of the
-# regular autodoc configuration as a side-effect when it's first imported, and
-# normally this import would happen after we had set up our autodoc
-# configuration. So our configuration was getting lost. See:
-#
-# https://github.com/python-trio/sphinxcontrib-trio/issues/8
-#
-# By importing it ourselves up front before we set up our configuration, we
-# get those side-effects out of the way early.
-import sphinx.ext.autosummary.generate
import inspect
try:
@@ -88,6 +78,7 @@
return False
CM_CODES = set()
+ACM_CODES = set()
from contextlib import contextmanager
CM_CODES.add(contextmanager(None).__code__)
@@ -99,6 +90,13 @@
else:
CM_CODES.add(contextmanager2(None).__code__)
+try:
+ from contextlib import asynccontextmanager
+except ImportError:
+ pass
+else:
+ ACM_CODES.add(asynccontextmanager(None).__code__)
+
extended_function_option_spec = {
"async": directives.flag,
"decorator": directives.flag,
@@ -113,7 +111,7 @@
"abstractmethod": directives.flag,
"staticmethod": directives.flag,
"classmethod": directives.flag,
- #"property": directives.flag,
+ "property": directives.flag,
}
autodoc_option_spec = {
@@ -126,8 +124,8 @@
class ExtendedCallableMixin:
def needs_arglist(self):
- # if "property" in self.options:
- # return False
+ if "property" in self.options:
+ return False
if ("decorator" in self.options
or self.objtype in ["decorator", "decoratormethod"]):
return False
@@ -264,6 +262,8 @@
options.add("with")
if getattr(obj, "__returns_contextmanager__", False):
options.add("with")
+ if getattr(obj, "__code__", None) in ACM_CODES:
+ options.add("async-with")
if getattr(obj, "__returns_acontextmanager__", False):
options.add("async-with")
if hasattr(obj, "__wrapped__"):
@@ -309,7 +309,11 @@
}
def add_directive_header(self, sig):
- super().add_directive_header(sig)
+ # We can't call super() here, because we want to *skip* executing
+ # FunctionDocumenter.add_directive_header, because starting in Sphinx
+ # 2.1 it does its own sniffing, which is worse than ours and will
+ # break ours. So we jump straight to the superclass.
+ ModuleLevelDocumenter.add_directive_header(self, sig)
passthrough_option_lines(self, extended_function_option_spec)
def import_object(self):
@@ -329,7 +333,11 @@
}
def add_directive_header(self, sig):
- super().add_directive_header(sig)
+ # We can't call super() here, because we want to *skip* executing
+ # FunctionDocumenter.add_directive_header, because starting in Sphinx
+ # 2.1 it does its own sniffing, which is worse than ours and will
+ # break ours. So we jump straight to the superclass.
+ ClassLevelDocumenter.add_directive_header(self, sig)
passthrough_option_lines(self, extended_method_option_spec)
def import_object(self):
@@ -378,13 +386,8 @@
app.add_autodocumenter(ExtendedMethodDocumenter)
# A monkey-patch to VariableCommentPicker to make autodoc_member_order =
'bysource' work.
- try:
- from sphinx.pycode.parser import VariableCommentPicker
- except ImportError:
- # Sphinx <1.7, it works out of the box.
- pass
- else:
- if not hasattr(VariableCommentPicker, "visit_AsyncFunctionDef"): #
pragma: no branch
- VariableCommentPicker.visit_AsyncFunctionDef =
VariableCommentPicker.visit_FunctionDef
+ from sphinx.pycode.parser import VariableCommentPicker
+ if not hasattr(VariableCommentPicker, "visit_AsyncFunctionDef"): #
pragma: no branch
+ VariableCommentPicker.visit_AsyncFunctionDef =
VariableCommentPicker.visit_FunctionDef
return {'version': __version__, 'parallel_read_safe': True}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio/_version.py
new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio/_version.py
--- old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio/_version.py 2019-01-28
04:27:01.000000000 +0100
+++ new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio/_version.py 2019-06-03
09:55:56.000000000 +0200
@@ -1 +1 @@
-__version__ = "1.0.2"
+__version__ = "1.1.0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio.egg-info/PKG-INFO
new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio.egg-info/PKG-INFO
--- old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio.egg-info/PKG-INFO
2019-01-28 04:45:56.000000000 +0100
+++ new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio.egg-info/PKG-INFO
2019-06-03 09:56:52.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: sphinxcontrib-trio
-Version: 1.0.2
+Version: 1.1.0
Summary: Make Sphinx better at documenting Python functions and methods
Home-page: https://github.com/python-trio/sphinxcontrib-trio
Author: Nathaniel J. Smith
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio.egg-info/SOURCES.txt
new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio.egg-info/SOURCES.txt
--- old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio.egg-info/SOURCES.txt
2019-01-28 04:45:56.000000000 +0100
+++ new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio.egg-info/SOURCES.txt
2019-06-03 09:56:52.000000000 +0200
@@ -5,6 +5,7 @@
MANIFEST.in
README.rst
setup.py
+test-requirements.in
test-requirements.txt
docs/Makefile
docs/make.bat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio.egg-info/requires.txt
new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio.egg-info/requires.txt
--- old/sphinxcontrib-trio-1.0.2/sphinxcontrib_trio.egg-info/requires.txt
2019-01-28 04:45:56.000000000 +0100
+++ new/sphinxcontrib-trio-1.1.0/sphinxcontrib_trio.egg-info/requires.txt
2019-06-03 09:56:52.000000000 +0200
@@ -1 +1 @@
-sphinx
+sphinx>=1.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-trio-1.0.2/test-requirements.in
new/sphinxcontrib-trio-1.1.0/test-requirements.in
--- old/sphinxcontrib-trio-1.0.2/test-requirements.in 1970-01-01
01:00:00.000000000 +0100
+++ new/sphinxcontrib-trio-1.1.0/test-requirements.in 2019-06-03
09:54:41.000000000 +0200
@@ -0,0 +1,7 @@
+pytest
+pytest-cov
+async_generator
+contextlib2
+lxml
+cssselect
+sphinx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-trio-1.0.2/test-requirements.txt
new/sphinxcontrib-trio-1.1.0/test-requirements.txt
--- old/sphinxcontrib-trio-1.0.2/test-requirements.txt 2017-05-13
08:56:11.000000000 +0200
+++ new/sphinxcontrib-trio-1.1.0/test-requirements.txt 2019-06-03
09:54:41.000000000 +0200
@@ -1,6 +1,45 @@
-pytest
-pytest-cov
-async_generator
-contextlib2
-lxml
-cssselect
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+# pip-compile test-requirements.in
+#
+alabaster==0.7.12 # via sphinx
+async-generator==1.10
+atomicwrites==1.3.0 # via pytest
+attrs==19.1.0 # via pytest
+babel==2.7.0 # via sphinx
+certifi==2019.3.9 # via requests
+chardet==3.0.4 # via requests
+contextlib2==0.5.5
+coverage==4.5.3 # via pytest-cov
+cssselect==1.0.3
+docutils==0.14 # via sphinx
+idna==2.8 # via requests
+imagesize==1.1.0 # via sphinx
+importlib-metadata==0.17 # via pluggy, pytest
+jinja2==2.10.1 # via sphinx
+lxml==4.3.3
+markupsafe==1.1.1 # via jinja2
+more-itertools==7.0.0 # via pytest
+packaging==19.0 # via pytest, sphinx
+pluggy==0.12.0 # via pytest
+py==1.8.0 # via pytest
+pygments==2.4.2 # via sphinx
+pyparsing==2.4.0 # via packaging
+pytest-cov==2.7.1
+pytest==4.6.1
+pytz==2019.1 # via babel
+requests==2.22.0 # via sphinx
+six==1.12.0 # via packaging, pytest
+snowballstemmer==1.2.1 # via sphinx
+sphinx==2.1.0
+sphinxcontrib-applehelp==1.0.1 # via sphinx
+sphinxcontrib-devhelp==1.0.1 # via sphinx
+sphinxcontrib-htmlhelp==1.0.2 # via sphinx
+sphinxcontrib-jsmath==1.0.1 # via sphinx
+sphinxcontrib-qthelp==1.0.2 # via sphinx
+sphinxcontrib-serializinghtml==1.1.3 # via sphinx
+urllib3==1.25.3 # via requests
+wcwidth==0.1.7 # via pytest
+zipp==0.5.1 # via importlib-metadata
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-trio-1.0.2/tests/test-docs-source/autodoc_examples.py
new/sphinxcontrib-trio-1.1.0/tests/test-docs-source/autodoc_examples.py
--- old/sphinxcontrib-trio-1.0.2/tests/test-docs-source/autodoc_examples.py
2018-08-06 02:42:40.000000000 +0200
+++ new/sphinxcontrib-trio-1.1.0/tests/test-docs-source/autodoc_examples.py
2019-06-03 09:54:41.000000000 +0200
@@ -30,6 +30,9 @@
async def asyncmethod(self):
pass
+ @property
+ def property_(self):
+ pass
class ExampleClassForOrder:
async def d_asyncmethod(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-trio-1.0.2/tests/test-docs-source/test.rst
new/sphinxcontrib-trio-1.1.0/tests/test-docs-source/test.rst
--- old/sphinxcontrib-trio-1.0.2/tests/test-docs-source/test.rst
2018-08-06 02:42:40.000000000 +0200
+++ new/sphinxcontrib-trio-1.1.0/tests/test-docs-source/test.rst
2019-06-03 09:54:41.000000000 +0200
@@ -25,7 +25,7 @@
.. code-block:: none
- <em class="property">await </em><code class="descname">foo</code>
+ <em class="property">await </em><code class="(sig-name
)?descname">foo</code>
.. warning::
@@ -34,7 +34,7 @@
.. code-block:: none
- <em class="property">await </em><code class="descname">foo</code>
+ <em class="property">await </em><code class="(sig-name
)?descname">foo</code>
Check all the formatting logic
@@ -49,7 +49,7 @@
.. code-block:: none
- <em class="property">abstractmethod staticmethod await </em><code
class="descname">foo</code>
+ <em class="property">abstractmethod staticmethod await </em><code
class="(sig-name )?descname">foo</code>
.. note::
@@ -59,7 +59,7 @@
.. code-block:: none
- <em class="property">classmethod </em><code class="descname">foo</code>
+ <em class="property">classmethod </em><code class="(sig-name
)?descname">foo</code>
.. note::
@@ -69,7 +69,7 @@
.. code-block:: none
- <em class="property">with </em><code class="descname">foo</code>
+ <em class="property">with </em><code class="(sig-name
)?descname">foo</code>
.. note::
@@ -79,7 +79,7 @@
.. code-block:: none
- <em class="property">with </em><code class="descname">foo</code><span
class="sig-paren">(</span><em>bar</em><span class="sig-paren">)</span><em
class="property"> as baz</em>
+ <em class="property">with </em><code class="(sig-name
)?descname">foo</code><span class="sig-paren">\(</span><em(
class="sig-param")?>bar</em><span class="sig-paren">\)</span><em
class="property"> as baz</em>
.. note::
@@ -88,7 +88,7 @@
.. code-block:: none
- <em class="property">async with </em><code class="descname">foo</code>
+ <em class="property">async with </em><code class="(sig-name
)?descname">foo</code>
.. note::
@@ -98,10 +98,10 @@
.. code-block:: none
- <em class="property">async with </em><code
class="descname">foo</code><span class="sig-paren">(</span><em>bar</em><span
class="sig-paren">)</span><em class="property"> as baz</em>
+ <em class="property">async with </em><code class="(sig-name
)?descname">foo</code><span class="sig-paren">\(</span><em(
class="sig-param")?>bar</em><span class="sig-paren">\)</span><em
class="property"> as baz</em>
-This one checks that there's no parentheses:
+This one checks that decorators don't normally have parentheses:
.. note::
@@ -109,7 +109,7 @@
.. code-block:: none
- <code class="descclassname">@</code><code
class="descname">foo</code></dt>
+ <code class="(sig-prename )?descclassname">@</code><code
class="(sig-name )?descname">foo</code></dt>
But if you do have arguments, they're displayed
@@ -120,7 +120,20 @@
.. code-block:: none
- <code class="descclassname">@</code><code
class="descname">foo</code><span class="sig-paren">(</span><em>bar</em>
+ <code class="(sig-prename )?descclassname">@</code><code
class="(sig-name )?descname">foo</code><span class="sig-paren">\(</span><em(
class="sig-param")?>bar</em>
+
+
+Same for properties, in case someone uses `.. method:: :property:`
+(instead of the more usual `.. data::`), or sphinx 2.1 uses it for us:
+
+.. note::
+
+ .. method:: foo()
+ :property:
+
+ .. code-block:: none
+
+ <code class="(sig-name )?descname">foo</code></dt>
.. note::
@@ -130,7 +143,7 @@
.. code-block:: none
- <em class="property">for ... in </em><code class="descname">foo</code>
+ <em class="property">for ... in </em><code class="(sig-name
)?descname">foo</code>
.. note::
@@ -140,7 +153,7 @@
.. code-block:: none
- <em class="property">for baz in </em><code class="descname">foo</code>
+ <em class="property">for baz in </em><code class="(sig-name
)?descname">foo</code>
.. note::
@@ -149,7 +162,7 @@
.. code-block:: none
- <em class="property">async for ... in </em><code
class="descname">foo</code>
+ <em class="property">async for ... in </em><code class="(sig-name
)?descname">foo</code>
.. note::
@@ -159,7 +172,7 @@
.. code-block:: none
- <em class="property">async for baz in </em><code
class="descname">foo</code>
+ <em class="property">async for baz in </em><code class="(sig-name
)?descname">foo</code>
Backwards compatibility directives
@@ -171,7 +184,7 @@
.. code-block:: none
- <code class="descclassname">@</code><code class="descname">foo</code>
+ <code class="(sig-prename )?descclassname">@</code><code
class="(sig-name )?descname">foo</code>
.. note::
@@ -179,7 +192,7 @@
.. code-block:: none
- <code class="descclassname">@</code><code class="descname">foo</code>
+ <code class="(sig-prename )?descclassname">@</code><code
class="(sig-name )?descname">foo</code>
.. note::
@@ -187,7 +200,7 @@
.. code-block:: none
- <em class="property">classmethod </em><code class="descname">foo</code>
+ <em class="property">classmethod </em><code class="(sig-name
)?descname">foo</code>
.. note::
@@ -195,7 +208,7 @@
.. code-block:: none
- <em class="property">staticmethod </em><code class="descname">foo</code>
+ <em class="property">staticmethod </em><code class="(sig-name
)?descname">foo</code>
Autodoc
@@ -211,7 +224,7 @@
.. code-block:: none
- <code class="descclassname">autodoc_examples.</code><code
class="descname">basic</code>
+ <code class="(sig-prename )?descclassname">autodoc_examples.</code><code
class="(sig-name )?descname">basic</code>
.. warning::
@@ -219,7 +232,7 @@
.. code-block:: none
- </em><code class="descname">basic</code>
+ </em><code class="(sig-name )?descname">basic</code>
.. note::
@@ -227,7 +240,7 @@
.. code-block:: none
- <em class="property">await </em><code
class="descclassname">autodoc_examples.</code><code
class="descname">asyncfn</code>
+ <em class="property">await </em><code class="(sig-prename
)?descclassname">autodoc_examples.</code><code class="(sig-name
)?descname">asyncfn</code>
We don't bother testing every bizarro combination here, because we
have unit tests for that.
@@ -245,19 +258,19 @@
.. code-block:: none
- <em class="property">abstractmethod </em><code
class="descname">abstractmethod_</code>
+ <em class="property">abstractmethod </em><code class="(sig-name
)?descname">abstractmethod_</code>
.. code-block:: none
- <em class="property">abstractmethod classmethod </em><code
class="descname">classabstract</code>
+ <em class="property">abstractmethod classmethod </em><code
class="(sig-name )?descname">classabstract</code>
.. code-block:: none
- <em class="property">classmethod </em><code
class="descname">classmethod_</code>
+ <em class="property">classmethod </em><code class="(sig-name
)?descname">classmethod_</code>
.. code-block:: none
- <em class="property">await </em><code class="descname">asyncmethod</code>
+ <em class="property">await </em><code class="(sig-name
)?descname">asyncmethod</code>
Autodoc + order by source:
@@ -277,7 +290,7 @@
.. code-block:: none
- <em class="property">for ... in await </em><code
class="descclassname">autodoc_examples.</code><code
class="descname">basic</code>
+ <em class="property">for ... in await </em><code class="(sig-prename
)?descclassname">autodoc_examples.</code><code class="(sig-name
)?descname">basic</code>
Overriding sniffed ``:for:`` with ``:for: arg``:
@@ -287,7 +300,7 @@
.. code-block:: none
- <em class="property">for ... in </em><code
class="descclassname">autodoc_examples.</code><code class="descname">gen</code>
+ <em class="property">for ... in </em><code class="(sig-prename
)?descclassname">autodoc_examples.</code><code class="(sig-name
)?descname">gen</code>
.. note::
@@ -296,7 +309,7 @@
.. code-block:: none
- <em class="property">for arg in </em><code
class="descclassname">autodoc_examples.</code><code class="descname">gen</code>
+ <em class="property">for arg in </em><code class="(sig-prename
)?descclassname">autodoc_examples.</code><code class="(sig-name
)?descname">gen</code>
Testing ``:no-auto-options:``:
@@ -308,7 +321,7 @@
.. code-block:: none
<dt>
- <code class="descclassname">autodoc_examples.</code><code
class="descname">gen</code>
+ <code class="(sig-prename )?descclassname">autodoc_examples.</code><code
class="(sig-name )?descname">gen</code>
.. warning::
@@ -327,7 +340,7 @@
.. code-block:: none
- <em class="property">for ... in </em><code
class="descclassname">autodoc_examples.</code><code class="descname">gen</code>
+ <em class="property">for ... in </em><code class="(sig-prename
)?descclassname">autodoc_examples.</code><code class="(sig-name
)?descname">gen</code>
.. note::
@@ -337,7 +350,7 @@
.. code-block:: none
- <em class="property">await </em><code
class="descclassname">autodoc_examples.</code><code class="descname">gen</code>
+ <em class="property">await </em><code class="(sig-prename
)?descclassname">autodoc_examples.</code><code class="(sig-name
)?descname">gen</code>
Autodoc + Autosummary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-trio-1.0.2/tests/test_sphinxcontrib_trio.py
new/sphinxcontrib-trio-1.1.0/tests/test_sphinxcontrib_trio.py
--- old/sphinxcontrib-trio-1.0.2/tests/test_sphinxcontrib_trio.py
2018-08-06 02:42:40.000000000 +0200
+++ new/sphinxcontrib-trio-1.1.0/tests/test_sphinxcontrib_trio.py
2019-06-03 09:54:41.000000000 +0200
@@ -10,6 +10,7 @@
import difflib
import shutil
from pathlib import Path
+import re
import lxml.html
@@ -27,6 +28,13 @@
else:
have_async_generator = True
+try:
+ from contextlib import asynccontextmanager
+except ImportError:
+ have_asynccontextmanager = False
+else:
+ have_asynccontextmanager = True
+
from sphinxcontrib_trio import sniff_options
if sys.version_info >= (3, 6):
@@ -136,6 +144,10 @@
check(acm_wrapped, "async-with")
+ if have_asynccontextmanager:
+ acm = asynccontextmanager(agen_native)
+ check(acm, "async-with")
+
# A chain with complex overrides. We ignore the intermediate generator and
# async function, because the outermost one is a contextmanager -- but we
# still pick up the staticmethod at the end of the chain.
@@ -195,7 +207,7 @@
test_content = test_content.replace("\u2026", "...")
for check in checks:
try:
- assert check in test_content
+ assert re.search(check, test_content) is not None
except:
print("failed check")
print()
