diff options
| -rw-r--r-- | CHANGES.txt | 5 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | pyramid/paster.py | 4 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 9edeb63c9..1b85d39be 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ -Next release -============ +1.1b4 (2011-07-18) +================== Documentation ------------- @@ -24,7 +24,6 @@ Features generally just run ``paster {pshell|proutes|pviews} development.ini`` and it will do mostly the right thing. - Bug Fixes --------- diff --git a/docs/conf.py b/docs/conf.py index 5c77e083b..597090c42 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.1b3' +version = '1.1b4' # The full version, including alpha/beta/rc tags. release = version diff --git a/pyramid/paster.py b/pyramid/paster.py index bb499ae8b..3aa6a5f1d 100644 --- a/pyramid/paster.py +++ b/pyramid/paster.py @@ -8,6 +8,8 @@ import zope.deprecation from paste.deploy import loadapp from paste.script.command import Command +from pyramid.interfaces import IMultiView + from pyramid.scripting import get_root from pyramid.scripting import prepare from pyramid.util import DottedNameResolver @@ -275,8 +277,6 @@ class PRoutesCommand(PCommand): self.out(fmt % (route.name, route.pattern, view_callable)) -from pyramid.interfaces import IMultiView - class PViewsCommand(PCommand): """Print, for a given URL, the views that might match. Underneath each potentially matching route, list the predicates required. Underneath @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1b3', + version='1.1b4', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, |