summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2014-08-23 09:04:21 +0900
committershimizukawa <shimizukawa@gmail.com>2014-08-23 09:04:21 +0900
commit4399f695af7013f6735455b2fa1c6381b07c6f34 (patch)
treed41537131f1ae76854ecf22596252b7d5d63b02e
parent9e2654d0482cdbc2d4bcc455e387702d74befb40 (diff)
downloadsphinx-4399f695af7013f6735455b2fa1c6381b07c6f34.tar.gz
:confval:`templates_path` is automatically added to :confval:`exclude_patterns` to avoid reading autosummary rst templates in the templates directory. Closes #1543
-rw-r--r--CHANGES3
-rw-r--r--doc/config.rst4
-rw-r--r--sphinx/environment.py1
3 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index f824827f..3123cf67 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,9 @@ Incompatible changes
* PR#269, #1476: replace `<tt>` tag by `<code>`. User customized stylesheets
should be updated If the css contain some styles for `<tt>` tag.
Thanks to Takeshi Komiya.
+* #1543: :confval:`templates_path` is automatically added to
+ :confval:`exclude_patterns` to avoid reading autosummary rst templates in the
+ templates directory.
Features added
--------------
diff --git a/doc/config.rst b/doc/config.rst
index ead0d444..6c00e6fe 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -120,6 +120,10 @@ General configuration
builtin/theme-specific templates). Relative paths are taken as relative to
the configuration directory.
+ .. versionchanged:: 1.3
+ As these files are not meant to be built, they are automatically added to
+ :confval:`exclude_patterns`.
+
.. confval:: template_bridge
A string with the fully-qualified name of a callable (or simply a class) that
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 2dfedcd0..d51e7a16 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -339,6 +339,7 @@ class BuildEnvironment:
"""
matchers = compile_matchers(
config.exclude_patterns[:] +
+ config.templates_path +
config.html_extra_path +
['**/_sources', '.#*']
)