##// END OF EJS Templates
Merge pull request #12235 from frenzymadness/fix_sphinx_300...
Matthias Bussonnier -
r25613:a5a8218d merge
parent child Browse files
Show More
@@ -69,11 +69,6 b' matrix:'
69 python: "3.7"
69 python: "3.7"
70 dist: xenial
70 dist: xenial
71 sudo: true
71 sudo: true
72 - arch: arm64
73 python: "3.7"
74 dist: xenial
75 env: ARM64=True IPYTHON_TESTING_TIMEOUT_SCALE=2
76 sudo: true
77 - arch: amd64
72 - arch: amd64
78 python: "3.8"
73 python: "3.8"
79 dist: xenial
74 dist: xenial
@@ -121,6 +121,29 b' numpydoc_show_class_members = False # Otherwise Sphinx emits thousands of warnin'
121 numpydoc_class_members_toctree = False
121 numpydoc_class_members_toctree = False
122 warning_is_error = True
122 warning_is_error = True
123
123
124 import logging
125
126 class ConfigtraitFilter(logging.Filter):
127 """
128 This is a filter to remove in sphinx 3+ the error about config traits being duplicated.
129
130 As we autogenerate configuration traits from, subclasses have lots of
131 duplication and we want to silence them. Indeed we build on travis with
132 warnings-as-error set to True, so those duplicate items make the build fail.
133 """
134
135 def filter(self, record):
136 if record.args and record.args[0] == 'configtrait' and 'duplicate' in record.msg:
137 return False
138 return True
139
140 ct_filter = ConfigtraitFilter()
141
142 import sphinx.util
143 logger = sphinx.util.logging.getLogger('sphinx.domains.std').logger
144
145 logger.addFilter(ct_filter)
146
124 # The default replacements for |version| and |release|, also used in various
147 # The default replacements for |version| and |release|, also used in various
125 # other places throughout the built documents.
148 # other places throughout the built documents.
126 #
149 #
@@ -116,7 +116,7 b' You can override a number of other methods to improve the functionality of your'
116 kernel. All of these methods should return a dictionary as described in the
116 kernel. All of these methods should return a dictionary as described in the
117 relevant section of the :doc:`messaging spec <messaging>`.
117 relevant section of the :doc:`messaging spec <messaging>`.
118
118
119 .. class:: MyKernel
119 .. class:: MyBetterKernel
120
120
121 .. method:: do_complete(code, cusor_pos)
121 .. method:: do_complete(code, cusor_pos)
122
122
@@ -8,8 +8,7 b''
8
8
9 Cross reference like this: :configtrait:`Application.log_datefmt`.
9 Cross reference like this: :configtrait:`Application.log_datefmt`.
10 """
10 """
11 from sphinx.locale import l_
11
12 from sphinx.util.docfields import Field
13
12
14 def setup(app):
13 def setup(app):
15 app.add_object_type('configtrait', 'configtrait', objname='Config option')
14 app.add_object_type('configtrait', 'configtrait', objname='Config option')
General Comments 0
You need to be logged in to leave comments. Login now