From 57ea8a176267cf5d5096703fa628f7c941f9a135 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Wed, 30 May 2018 14:30:57 -0400 Subject: [PATCH 1/5] Remove CSS override that doesn't exist. Also remove static path file, and run our tests with warnings enabled since we can now. --- docs/conf.py | 5 +---- tox.ini | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e8201d8622d..61886f7e4e6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -71,7 +71,7 @@ gettext_compact = False html_theme = 'sphinx_rtd_theme' -html_static_path = ['_static'] +#html_static_path = ['_static'] html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] html_logo = 'img/logo.svg' html_theme_options = { @@ -79,6 +79,3 @@ 'display_version': False, } - -def setup(app): - app.add_stylesheet('custom.css') diff --git a/tox.ini b/tox.ini index 192eafa3f4d..7965afc0b87 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ commands = description = build readthedocs documentation changedir = {toxinidir}/docs commands = - sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html + sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:docs-lint] description = run linter (rstcheck) to ensure there aren't errors on our docs From 978541f3472fccb426d48be2500420fd6479546c Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Wed, 30 May 2018 14:49:55 -0400 Subject: [PATCH 2/5] Fix RTD settings to allow Sphinx logging --- readthedocs/settings/dev.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readthedocs/settings/dev.py b/readthedocs/settings/dev.py index 9cbf4e9f5fc..6f2eff18f9a 100644 --- a/readthedocs/settings/dev.py +++ b/readthedocs/settings/dev.py @@ -51,6 +51,8 @@ def DATABASES(self): # noqa def LOGGING(self): # noqa - avoid pep8 N802 logging = super(CommunityDevSettings, self).LOGGING logging['formatters']['default']['format'] = '[%(asctime)s] ' + self.LOG_FORMAT + # Allow Sphinx and other tools to create loggers + logging['disable_existing_loggers'] = False return logging From 6d3b1b7f855a9e8edb732af09c4368938f5aa7d2 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Wed, 30 May 2018 14:53:03 -0400 Subject: [PATCH 3/5] Properly run in nitpicky mode --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7965afc0b87..df1044e9e02 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ commands = description = build readthedocs documentation changedir = {toxinidir}/docs commands = - sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html + sphinx-build -n -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:docs-lint] description = run linter (rstcheck) to ensure there aren't errors on our docs From e3c966ff5b4b64cc731a42ffb85356f19094e5eb Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Wed, 30 May 2018 14:53:51 -0400 Subject: [PATCH 4/5] Don't change tox yet, just fix this bug --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index df1044e9e02..ec40227790f 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ commands = description = build readthedocs documentation changedir = {toxinidir}/docs commands = - sphinx-build -n -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html + sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:docs-lint] description = run linter (rstcheck) to ensure there aren't errors on our docs From 96ca357f4be7403269132109c493ba57f199349c Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Wed, 30 May 2018 14:54:45 -0400 Subject: [PATCH 5/5] Small lint fix --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 61886f7e4e6..ae0de2f684c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -71,7 +71,7 @@ gettext_compact = False html_theme = 'sphinx_rtd_theme' -#html_static_path = ['_static'] +# html_static_path = ['_static'] html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] html_logo = 'img/logo.svg' html_theme_options = {