Commit 30c47a28 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'renovate/sphinx-2.x' into 'master'

Update dependency sphinx to ~2.1

See merge request !1280
parents 676825d4 7d518519
...@@ -41,4 +41,3 @@ activemembers.api.views module ...@@ -41,4 +41,3 @@ activemembers.api.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -80,4 +80,3 @@ activemembers.views module ...@@ -80,4 +80,3 @@ activemembers.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -57,4 +57,3 @@ announcements.views module ...@@ -57,4 +57,3 @@ announcements.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -24,7 +24,6 @@ sys.path.insert(0, os.path.abspath('../website')) ...@@ -24,7 +24,6 @@ sys.path.insert(0, os.path.abspath('../website'))
import django import django
from django.conf import settings # noqa from django.conf import settings # noqa
from recommonmark.parser import CommonMarkParser # noqa
from thaliawebsite import settings as thalia_settings # noqa from thaliawebsite import settings as thalia_settings # noqa
...@@ -50,24 +49,18 @@ extensions = [ ...@@ -50,24 +49,18 @@ extensions = [
'sphinx.ext.viewcode', 'sphinx.ext.viewcode',
'sphinx.ext.intersphinx', 'sphinx.ext.intersphinx',
'sphinx.ext.graphviz', 'sphinx.ext.graphviz',
'recommonmark',
] ]
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates'] templates_path = ['_templates']
# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
source_parsers = {
'.md': CommonMarkParser,
}
source_suffix = ['.rst', '.md']
# The master toctree document. # The master toctree document.
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = 'Concrexit' project = 'Concrexit'
copyright = "2017, Technicie, Studievereniging Thalia" copyright = "2017--2019, Technicie, Studievereniging Thalia"
author = "Technicie, Studievereniging Thalia" author = "Technicie, Studievereniging Thalia"
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
...@@ -178,8 +171,11 @@ texinfo_documents = [ ...@@ -178,8 +171,11 @@ texinfo_documents = [
# -- Options for autodoc -------------------------------------------------- # -- Options for autodoc --------------------------------------------------
# Default flags for autodoc, saves typing # Default options for autodoc
autodoc_default_flags = ['members', 'undoc-members'] autodoc_default_options = {
'members': True,
'undoc-members': True,
}
# We need to mock the modules for the sphinx build in the docker. # We need to mock the modules for the sphinx build in the docker.
autodoc_mock_imports = ['factory', 'pydenticon', 'faker'] autodoc_mock_imports = ['factory', 'pydenticon', 'faker']
...@@ -192,24 +188,11 @@ doctest_test_doctest_blocks = '' ...@@ -192,24 +188,11 @@ doctest_test_doctest_blocks = ''
# -- intersphinx --- # -- intersphinx ---
intersphinx_mapping = { intersphinx_mapping = {
'python': ('https://docs.python.org/3.7', None), 'python': ('https://docs.python.org/3.7', None),
'django': ('https://docs.djangoproject.com/en/2.1/', 'django': ('https://docs.djangoproject.com/en/2.2/',
'https://docs.djangoproject.com/en/2.1/_objects/'), 'https://docs.djangoproject.com/en/2.2/_objects/'),
} }
# -- Supress warnings --- # -- Supress warnings ---
suppress_warnings = [ suppress_warnings = [
'image.nonlocal_uri', 'image.nonlocal_uri',
] ]
# Hotfix for problems with name clashes in references
# https://github.com/sphinx-doc/sphinx/issues/3866
from sphinx.domains.python import PythonDomain
class PatchedPythonDomain(PythonDomain):
def resolve_xref(self, env, fromdocname, builder, typ, target, node, contnode):
if 'refspecific' in node:
del node['refspecific']
return super(PatchedPythonDomain, self).resolve_xref(
env, fromdocname, builder, typ, target, node, contnode)
def setup(sphinx):
sphinx.override_domain(PatchedPythonDomain)
...@@ -80,4 +80,3 @@ documents.views module ...@@ -80,4 +80,3 @@ documents.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -25,4 +25,3 @@ documents.templatetags.filename module ...@@ -25,4 +25,3 @@ documents.templatetags.filename module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -65,4 +65,3 @@ education.views module ...@@ -65,4 +65,3 @@ education.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -41,4 +41,3 @@ events.api.viewsets module ...@@ -41,4 +41,3 @@ events.api.viewsets module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -128,4 +128,3 @@ events.widgets module ...@@ -128,4 +128,3 @@ events.widgets module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -41,4 +41,3 @@ mailinglists.api.viewsets module ...@@ -41,4 +41,3 @@ mailinglists.api.viewsets module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -48,4 +48,3 @@ mailinglists.services module ...@@ -48,4 +48,3 @@ mailinglists.services module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -33,4 +33,3 @@ members.api.viewsets module ...@@ -33,4 +33,3 @@ members.api.viewsets module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -104,4 +104,3 @@ members.views module ...@@ -104,4 +104,3 @@ members.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -57,4 +57,3 @@ merchandise.views module ...@@ -57,4 +57,3 @@ merchandise.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -73,4 +73,3 @@ newsletters.views module ...@@ -73,4 +73,3 @@ newsletters.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -65,4 +65,3 @@ partners.views module ...@@ -65,4 +65,3 @@ partners.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -17,4 +17,3 @@ payments.management.commands.revokeoldmandates module ...@@ -17,4 +17,3 @@ payments.management.commands.revokeoldmandates module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -12,4 +12,3 @@ Subpackages ...@@ -12,4 +12,3 @@ Subpackages
.. toctree:: .. toctree::
payments.management.commands payments.management.commands
...@@ -88,4 +88,3 @@ payments.widgets module ...@@ -88,4 +88,3 @@ payments.widgets module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
...@@ -57,4 +57,3 @@ photos.views module ...@@ -57,4 +57,3 @@ photos.views module
:undoc-members: :undoc-members:
:show-inheritance: :show-inheritance:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment