From 59626acab6014dcf433050e228a53886e764950b Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 15 Apr 2015 09:55:15 -0400 Subject: master is now 1.7 --- README.rst | 2 +- docs/conf.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 9adfd90e7..6de42ea40 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Pyramid ======= -.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.6-branch +.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master :target: https://travis-ci.org/Pylons/pyramid .. image:: https://readthedocs.org/projects/pyramid/badge/?version=master diff --git a/docs/conf.py b/docs/conf.py index 65c0e3a8b..fa4578275 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -159,7 +159,7 @@ html_theme_path = ['_themes'] html_theme = 'pyramid' html_theme_options = dict( github_url='https://github.com/Pylons/pyramid', - in_progress='false', + in_progress='true', ) # The name for this set of Sphinx documents. If None, it defaults to diff --git a/setup.py b/setup.py index 46b08e59b..e91e0ee21 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.6a1', + version='1.7.dev0', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ -- cgit v1.2.3