prep 1.7

Michael Merickel

2016-05-20 1821759e863e5453eeecbd40238b93923eaadff4

prep 1.7

 CHANGES.txt

@@ -1,10 +1,10 @@
unreleased
==========
1.7 (2016-05-19)
================

- Fix a bug in the wiki2 tutorial where bcrypt is always expecting byte
  strings. See https://github.com/Pylons/pyramid/pull/2576

- Simply windows detection code and remove some duplicated data.
- Simplify windows detection code and remove some duplicated data.
  See https://github.com/Pylons/pyramid/pull/2585 and
  https://github.com/Pylons/pyramid/pull/2586


 contributing.md

@@ -25,13 +25,11 @@
listed below.

* [master](https://github.com/Pylons/pyramid/) - The branch on which further
development takes place. The default branch on GitHub.
  development takes place. The default branch on GitHub.
* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The branch
classified as alpha. Actively maintained.
* [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The branch
classified as "stable" or "latest". Actively maintained.
* [1.5-branch](https://github.com/Pylons/pyramid/tree/1.5-branch) - The oldest
actively maintained and stable branch.
  classified as "stable" or "latest".
* [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The oldest
  actively maintained and stable branch.

Older branches are not actively maintained. In general, two stable branches and
one or two development branches are actively maintained.

 docs/conf.py

@@ -150,7 +150,7 @@
    github_url='https://github.com/Pylons/pyramid',
    # On master branch and new branch still in
    # pre-release status: true; else: false.
    in_progress='true',
    in_progress='false',
    # On branches previous to "latest": true; else: false.
    outdated='false',
    )

 setup.py

@@ -72,7 +72,7 @@
    ]

setup(name='pyramid',
      version='1.7b4',
      version='1.7',
      description='The Pyramid Web Framework, a Pylons project',
      long_description=README + '\n\n' + CHANGES,
      classifiers=[