diff options
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | RELEASING.txt | 10 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 12 insertions, 4 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/RELEASING.txt b/RELEASING.txt index 6d25ecb62..87ff62c53 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -24,7 +24,9 @@ Releasing Pyramid communicate with contributors). - Copy relevant changes (delta bug fixes) from CHANGES.txt to - docs/whatsnew-X.X (if it's a major release). + docs/whatsnew-X.X (if it's a major release). Minor releases should + include a link under "Bug Fix Releases" to the minor feature + changes in CHANGES.txt . - update README.rst to use correct versions of badges and URLs according to each branch and context, i.e., RTD "latest" == GitHub/Travis "1.x-branch". @@ -49,6 +51,12 @@ Releasing Pyramid $ python setup.py sdist bdist_wheel $ twine upload dist/pyramid-X.X-* +- Edit Pylons/pylonshq/templates/home/home.mako for minor and major updates. + +- Edit Pylons/pylonshq/templates/home/inside.rst for major updates only. + +- Edit Pylons/pylonsrtd/pylonsrtd/docs/pyramid.rst for all updates. + - Edit `http://wiki.python.org/moin/WebFrameworks <http://wiki.python.org/moin/WebFrameworks>`_. 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 @@ -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=[ |