From 29615272e0f5668373f5e1eca56d3209cfac8ffa Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 14 Jul 2017 05:33:35 +0200
Subject: [PATCH] prep 1.8.5
---
docs/whatsnew-1.8.rst | 1 +
setup.py | 2 +-
CHANGES.txt | 6 ++++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 6c5324b..d8909b8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
-unreleased
-==========
+.. _changes_1.8.5:
+
+1.8.5 (2017-07-13)
+==================
- Fix a circular import which made it impossible to import
``pyramid.viewderivers`` before ``pyramid.config``.
diff --git a/docs/whatsnew-1.8.rst b/docs/whatsnew-1.8.rst
index 64470a8..ca2487b 100644
--- a/docs/whatsnew-1.8.rst
+++ b/docs/whatsnew-1.8.rst
@@ -19,6 +19,7 @@
- :ref:`changes_1.8.2`
- :ref:`changes_1.8.3`
- :ref:`changes_1.8.4`
+- :ref:`changes_1.8.5`
Major Feature Additions
-----------------------
diff --git a/setup.py b/setup.py
index 7359d70..a1e4aaf 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@
]
setup(name='pyramid',
- version='1.8.4',
+ version='1.8.5',
description='The Pyramid Web Framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[
--
Gitblit v1.9.3