From 73b851a2bac7cf32a1d1df594a04cdd631e3391a Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 25 Dec 2016 19:48:28 -0600 Subject: prep 1.8a1 --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.rst') diff --git a/README.rst b/README.rst index 6ef75e899..7179fa8db 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,9 @@ Pyramid ======= -.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master +.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.8-branch :target: https://travis-ci.org/Pylons/pyramid - :alt: Master Travis CI Status + :alt: 1.8-branch Travis CI Status .. image:: https://readthedocs.org/projects/pyramid/badge/?version=master :target: http://docs.pylonsproject.org/projects/pyramid/en/master/ -- cgit v1.2.3 From 8ffa42a601e058c1ce3c433b9dc1f4466d07af06 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sat, 21 Jan 2017 18:26:30 -0600 Subject: swap back to master travis-ci on master branch --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.rst') diff --git a/README.rst b/README.rst index 7179fa8db..b7c03a7ae 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,9 @@ Pyramid ======= -.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.8-branch +.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master :target: https://travis-ci.org/Pylons/pyramid - :alt: 1.8-branch Travis CI Status + :alt: master Travis CI Status .. image:: https://readthedocs.org/projects/pyramid/badge/?version=master :target: http://docs.pylonsproject.org/projects/pyramid/en/master/ -- cgit v1.2.3 From 8814851b1f0df0c8f5cc6d0a497f9381101fdd45 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sun, 22 Jan 2017 00:11:20 -0800 Subject: save a redirect (cherry picked from commit 981869a) --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.rst') diff --git a/README.rst b/README.rst index b7c03a7ae..f05dd8bbf 100644 --- a/README.rst +++ b/README.rst @@ -38,7 +38,7 @@ and deployment more fun, more predictable, and more productive. server = make_server('0.0.0.0', 8080, app) server.serve_forever() -Pyramid is a project of the `Pylons Project `_. +Pyramid is a project of the `Pylons Project `_. Support and Documentation ------------------------- -- cgit v1.2.3 From 134ef7e8d17842e286528aeb8d2936579ed81053 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Fri, 16 Dec 2016 00:48:52 -0600 Subject: turn the Configurator into a context manager fixes #2872 --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README.rst') diff --git a/README.rst b/README.rst index f05dd8bbf..302590fe1 100644 --- a/README.rst +++ b/README.rst @@ -31,10 +31,10 @@ and deployment more fun, more predictable, and more productive. return Response('Hello %(name)s!' % request.matchdict) if __name__ == '__main__': - config = Configurator() - config.add_route('hello', '/hello/{name}') - config.add_view(hello_world, route_name='hello') - app = config.make_wsgi_app() + with Configurator() as config: + config.add_route('hello', '/hello/{name}') + config.add_view(hello_world, route_name='hello') + app = config.make_wsgi_app() server = make_server('0.0.0.0', 8080, app) server.serve_forever() -- cgit v1.2.3 From 33f1c247272e58993003777677c7c6a7a4f5e38c Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 1 May 2017 21:33:36 -0500 Subject: switch readme to 1.9-branch badges --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'README.rst') diff --git a/README.rst b/README.rst index 302590fe1..5f42115df 100644 --- a/README.rst +++ b/README.rst @@ -1,16 +1,16 @@ Pyramid ======= -.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master +.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.9-branch :target: https://travis-ci.org/Pylons/pyramid :alt: master Travis CI Status -.. image:: https://readthedocs.org/projects/pyramid/badge/?version=master - :target: http://docs.pylonsproject.org/projects/pyramid/en/master/ +.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch + :target: http://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/ :alt: Master Documentation Status -.. image:: https://readthedocs.org/projects/pyramid/badge/?version=latest - :target: http://docs.pylonsproject.org/projects/pyramid/en/latest/ +.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch + :target: http://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/ :alt: Latest Documentation Status .. image:: https://img.shields.io/badge/irc-freenode-blue.svg -- cgit v1.2.3