Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update scaffold to be consistent with Pyramid's default scaffolds #116

Merged
merged 3 commits into from Jan 18, 2016

Conversation

stevepiercy
Copy link
Member

  • use variables instead of hard-coded values
  • update setup.py
  • update development.ini
  • add new pyramid logo
  • sign contributors

Ping @domenkozar or @mmerickel for review.

This update might necessitate another release.

@@ -38,15 +38,15 @@
<span class="smaller">Jinja2 scaffold</span>
</h1>
<p class="lead">
{% trans %}Hello{% endtrans %} to <span class="font-normal">\{\{ project \}\}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework 1.5.4</span>.</p>
{% trans %}Hello{% endtrans %} to <span class="font-normal">\{\{ project \}\}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework {{pyramid_version}}</span>.</p>
Copy link
Member

Choose a reason for hiding this comment

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

where is {{pyramid_version}} coming from? Does it need to be escaped like \{\{ project \}\}? Happy to merge if you tested this looks OK

Copy link
Member Author

Choose a reason for hiding this comment

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

Both {{pyramid_version}} and {{pyramid_docs_branch}} are variables in the scaffold framework since Pylons/pyramid@0eff663

Escaping is not needed because pcreate renders the values, not the jinja2 template.

I've tested locally, and it works.

@domenkozar
Copy link
Member

🍺 awesome job!

domenkozar added a commit that referenced this pull request Jan 18, 2016
update scaffold to be consistent with Pyramid's default scaffolds
@domenkozar domenkozar merged commit cba0446 into Pylons:master Jan 18, 2016
@stevepiercy
Copy link
Member Author

Thank you! Now I can update the Pyramid docs. 😀

@stevepiercy stevepiercy mentioned this pull request Jan 18, 2016
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.

None yet

2 participants