move {ARTICLE,PAGE}_DIR -> {ARTICLE,PAGE}_PATHS and correlate with {ARTICLE,PAGE}_EXCLUDES #1322
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I get some weird errors with these tests: Not sure what to make of it. When I test this PR on my normal site, it works fine. |
| @@ -462,7 +463,7 @@ def generate_context(self): | |||
| all_articles = [] | |||
| all_drafts = [] | |||
| for f in self.get_files( | |||
| self.settings['ARTICLE_DIR'], | |||
There was a problem hiding this comment.
We should still support ARTICLE_DIR and deprecate it instead of removing it so soon. So we don't break peoples config without deprecating the settings.
ARTICLE_DIR should be added to ARTICLE_PATHS for now.
|
Thank you @kylef for reminding me, added some backward compatibility code. |
|
Running the tests on this PR on my development environment (Mac OS X 10.9.2) results in a hung state — the tests never complete. Any updates on this effort, Ondrej? |
|
I still have no idea what is wrong, it seemed simple enough. |
ingwinlu
added a commit
to ingwinlu/pelican
that referenced
this pull request
May 5, 2014
ingwinlu
pushed a commit
to ingwinlu/pelican
that referenced
this pull request
May 6, 2014
Instead of one path a list can be given. This is due to popular request. Should help people not wanting to use Pelican for blogging. Maintain backward compatibility though. fix for getpelican#1322
ingwinlu
added a commit
to ingwinlu/pelican
that referenced
this pull request
May 6, 2014
ingwinlu
added a commit
to ingwinlu/pelican
that referenced
this pull request
May 6, 2014
if user still uses old path format, this will wrap the string into a list an process normally
ingwinlu
added a commit
to ingwinlu/pelican
that referenced
this pull request
May 6, 2014
if old path settings is used, it gets wrapped into a list and processed normally
Closed
ingwinlu
added a commit
to ingwinlu/pelican
that referenced
this pull request
May 6, 2014
if old path settings is used, it gets wrapped into a list and processed normally
ingwinlu
added a commit
to ingwinlu/pelican
that referenced
this pull request
May 6, 2014
change how STATIC_PATHS get processed to work with the new get_files function
|
@smartass101: We do now — see #1344. |
smartass101
changed the title
|
As discussed on https://botbot.me/freenode/pelican/msg/14590798/ , as part of this unification with other |
Instead of one path a list can be given. This is due to popular request. Should help people not wanting to use Pelican for blogging. Maintain backward compatibility though. Thanks to @ingwinlu for pointing out the change in StaticGenerator.
Pelican uses *_PATHS names for settings that represent a list of paths.
This makes it easier for someone to change PAGE_PATHS without the need to change ARTICLE_EXCLUDES accordingly.
|
Great work, Ondrej. One minor thing to correct, methinks: I believe you added the first warning, which should be kept, while the (now-redundant) second warning was part of the initial implementation by @nikhilkalige. |
|
As per discussion on IRC, @smartass101 mentioned that both warnings have their value and should remain. Thanks for all your work on this, Ondrej! |
justinmayer
added a commit
that referenced
this pull request
Jun 25, 2014
move {ARTICLE,PAGE}_DIR -> {ARTICLE,PAGE}_PATHS and correlate with {ARTICLE,PAGE}_EXCLUDES
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of one path a list can be given. This due to popular request.
Should help people not wanting to use Pelican for blogging.