Skip to content

Commit

Permalink
Merge branch 'main' into bug/short-paragraph-summary
Browse files Browse the repository at this point in the history
  • Loading branch information
justinmayer authored Nov 27, 2024
2 parents 9e74c82 + 7096b0a commit 3a6c721
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions docs/settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@ Basic settings

READERS = {'foo': FooReader}

.. data:: IGNORE_FILES = ['.#*']
.. data:: IGNORE_FILES = ['.*']

A list of glob patterns. Files and directories matching any of these
patterns will be ignored by the processor. For example, the default
``['.#*']`` will ignore emacs lock files, and ``['__pycache__']`` would
ignore Python 3's bytecode caches.
A list of glob patterns. Files and directories matching any of these patterns
will be ignored by the processor. For example, the default ``['.*']`` will
ignore "hidden" files and directories, and ``['__pycache__']`` would ignore
Python 3's bytecode caches.

.. data:: MARKDOWN = {...}

Expand Down
3 changes: 2 additions & 1 deletion pelican/contents.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,9 @@ def _find_path(path: str) -> Optional[Content]:
origin = joiner(siteurl, Author(path, self.settings).url)
else:
logger.warning(
"Replacement Indicator '%s' not recognized, skipping replacement",
"Replacement Indicator %r not recognized in %r, skipping replacement",
what,
origin,
)

# keep all other parts, such as query, fragment, etc.
Expand Down
2 changes: 1 addition & 1 deletion pelican/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def load_source(name: str, path: str) -> ModuleType:
"PYGMENTS_RST_OPTIONS": {},
"TEMPLATE_PAGES": {},
"TEMPLATE_EXTENSIONS": [".html"],
"IGNORE_FILES": [".#*"],
"IGNORE_FILES": [".*"],
"SLUG_REGEX_SUBSTITUTIONS": [
(r"[^\w\s-]", ""), # remove non-alphabetical/whitespace/'-' chars
(r"(?u)\A\s*", ""), # strip leading whitespace
Expand Down
2 changes: 1 addition & 1 deletion pelican/tests/test_contents.py
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ def test_unknown_link_syntax(self):
self.assertEqual(content, html)
self.assertLogCountEqual(
count=1,
msg="Replacement Indicator 'unknown' not recognized, "
msg="Replacement Indicator 'unknown' not recognized in '{unknown}foo', "
"skipping replacement",
level=logging.WARNING,
)
Expand Down

0 comments on commit 3a6c721

Please sign in to comment.