Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ matrix:
python: "3.7"
dist: xenial
sudo: true
- arch: arm64
python: "3.7"
dist: xenial
env: ARM64=True IPYTHON_TESTING_TIMEOUT_SCALE=2
sudo: true
- arch: amd64
python: "3.8-dev"
dist: xenial
Expand Down
23 changes: 23 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,29 @@ def is_stable(extra):
numpydoc_class_members_toctree = False
warning_is_error = True

import logging

class ConfigtraitFilter(logging.Filter):
"""
This is a filter to remove in sphinx 3+ the error about config traits being duplicated.

As we autogenerate configuration traits from, subclasses have lots of
duplication and we want to silence them. Indeed we build on travis with
warnings-as-error set to True, so those duplicate items make the build fail.
"""

def filter(self, record):
if record.args and record.args[0] == 'configtrait' and 'duplicate' in record.msg:
return False
return True

ct_filter = ConfigtraitFilter()

import sphinx.util
logger = sphinx.util.logging.getLogger('sphinx.domains.std').logger

logger.addFilter(ct_filter)

# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/source/development/wrapperkernels.rst
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ You can override a number of other methods to improve the functionality of your
kernel. All of these methods should return a dictionary as described in the
relevant section of the :doc:`messaging spec <messaging>`.

.. class:: MyKernel
.. class:: MyBetterKernel

.. method:: do_complete(code, cusor_pos)

Expand Down
3 changes: 1 addition & 2 deletions docs/sphinxext/configtraits.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

Cross reference like this: :configtrait:`Application.log_datefmt`.
"""
from sphinx.locale import l_
from sphinx.util.docfields import Field


def setup(app):
app.add_object_type('configtrait', 'configtrait', objname='Config option')
Expand Down