diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-04-11 02:44:15 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-04-11 02:44:15 -0700 |
| commit | 76b4086d403833efa43d614310a7d983ad4d7753 (patch) | |
| tree | 6b79a3f2f4cf1516a8d0aaa7a614c11291c09272 /docs/narr/MyProject/myproject | |
| parent | 59b69f3edf116f8471445aedd832911bf007c9e9 (diff) | |
| parent | 1f67fd91990d3bd3e337ba2d80c76925ba5e4a3e (diff) | |
| download | pyramid-76b4086d403833efa43d614310a7d983ad4d7753.tar.gz pyramid-76b4086d403833efa43d614310a7d983ad4d7753.tar.bz2 pyramid-76b4086d403833efa43d614310a7d983ad4d7753.zip | |
Merge pull request #2471 from stevepiercy/docs/easy-install-to-pip.2104
- update narr/project.rst to use pip instead of setup.py
Diffstat (limited to 'docs/narr/MyProject/myproject')
| -rw-r--r-- | docs/narr/MyProject/myproject/templates/mytemplate.pt | 6 | ||||
| -rw-r--r-- | docs/narr/MyProject/myproject/tests.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 65d7f0609..543663fe8 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -34,15 +34,15 @@ <div class="col-md-10"> <div class="content"> <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Starter scaffold</span></h1> - <p class="lead">Welcome to <span class="font-normal">${project}</span>, an application generated by<br>the <span class="font-normal">Pyramid Web Framework 1.6b2</span>.</p> + <p class="lead">Welcome to <span class="font-normal">${project}</span>, an application generated by<br>the <span class="font-normal">Pyramid Web Framework 1.7</span>.</p> </div> </div> </div> <div class="row"> <div class="links"> <ul> - <li class="current-version">Generated by v1.6b2</li> - <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/1.6-branch/">Docs</a></li> + <li class="current-version">Generated by v1.7</li> + <li><i class="glyphicon glyphicon-bookmark icon-muted"></i><a href="http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/">Docs</a></li> <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li> <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li> <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li> diff --git a/docs/narr/MyProject/myproject/tests.py b/docs/narr/MyProject/myproject/tests.py index 37df08a2a..fd414cced 100644 --- a/docs/narr/MyProject/myproject/tests.py +++ b/docs/narr/MyProject/myproject/tests.py @@ -26,4 +26,4 @@ class FunctionalTests(unittest.TestCase): def test_root(self): res = self.testapp.get('/', status=200) - self.assertTrue('Pyramid' in res.body) + self.assertTrue(b'Pyramid' in res.body) |