Skip to content

pelican-quickstart: switch to jinja2#2122

Merged
justinmayer merged 1 commit into
getpelican:masterfrom
ix5:quickstart-jinja
Feb 8, 2018
Merged

pelican-quickstart: switch to jinja2#2122
justinmayer merged 1 commit into
getpelican:masterfrom
ix5:quickstart-jinja

Conversation

@ix5

@ix5 ix5 commented Mar 21, 2017

Copy link
Copy Markdown
Contributor

As per request by @justinmayer on issue #2000, to omit unused build targets and allow for more powerful templating.

  • Use the jinja2 templating language for Makefile, fabfile,
    pelicanconf, publishconf, and develop-server.sh
  • Add logic in pelican_quickstart.py
  • Let jinja2 handle opening and reading template files
  • Remove thus unused functions for string.Template

@ix5

ix5 commented Mar 21, 2017

Copy link
Copy Markdown
Contributor Author

Do we really need to make flake8-import-order happy?
They say this about themselves:

This plugin is under somewhat active development and is heavily influenced by the personal preferences of the developers of cryptography. Expect seemingly random changes and configuration changes as we figure out how it should work.

@ix5

ix5 commented Dec 9, 2017

Copy link
Copy Markdown
Contributor Author

Closing due to inactivity

@ix5 ix5 closed this Dec 9, 2017
@justinmayer

Copy link
Copy Markdown
Member

Apologies, @ix5. It's been a busy year.

Any @getpelican/reviewers have a moment to review this pull request?

@justinmayer justinmayer reopened this Dec 9, 2017

@iKevinY iKevinY left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies for the review delay, @ix5. I ran pelican-quickstart, and the generated Makefile and configuration files all look good! There are few changes that need to be pulled in (see merge conflicts), but other than that, this seems good to merge to me. 👍

- Use the jinja2 templating language for Makefile, fabfile,
  pelicanconf, publishconf, and develop-server.sh
- Add logic in pelican_quickstart.py
- Let jinja2 handle opening and reading template files
- Remove thus unused functions for string.Template
@ix5

ix5 commented Dec 10, 2017

Copy link
Copy Markdown
Contributor Author

Heh, I saw the growing backlog of issues and PRs, didn't want to keep it that way and closed this one.

Anyway, I've rebased off master, fixed conflicts, should be good to go. Travis gives the go-ahead as well.

Thanks for keeping this project running, @justinmayer, you're a treasure. And thank you @iKevinY as well!

@ix5

ix5 commented Dec 13, 2017

Copy link
Copy Markdown
Contributor Author

Hey @iKevinY @justinmayer could you please merge this?

@justinmayer justinmayer added this to the 3.8.0 milestone Feb 8, 2018
@justinmayer

Copy link
Copy Markdown
Member

Many thanks, @ix5, for your contribution, kind words, and patience. And thanks to @iKevinY for reviewing!

@justinmayer justinmayer merged commit f776e56 into getpelican:master Feb 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants