diff options
| author | Chris McDonough <chrism@plope.com> | 2012-12-10 15:46:57 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-12-10 15:46:57 -0500 |
| commit | a7e0e601df4e093ebd2fdd7b53bd0bbb9e8d7ce5 (patch) | |
| tree | 8ae8d109b2a2443663690bbd532491b77adfc291 | |
| parent | 8389a5b3339b18f2ba7242d05d11ecb64371f3d9 (diff) | |
| download | pyramid-a7e0e601df4e093ebd2fdd7b53bd0bbb9e8d7ce5.tar.gz pyramid-a7e0e601df4e093ebd2fdd7b53bd0bbb9e8d7ce5.tar.bz2 pyramid-a7e0e601df4e093ebd2fdd7b53bd0bbb9e8d7ce5.zip | |
prep for 1.4b2
| -rw-r--r-- | CHANGES.txt | 11 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 9d3a017ab..e7c6e2b24 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,12 @@ -next release -============ +1.4b2 (2012-12-10) +================== + +Docs +---- + +- Scaffolding is now PEP-8 compliant (at least for a brief shining moment). + +- Tutorial improvements. Backwards Incompatibilities --------------------------- diff --git a/docs/conf.py b/docs/conf.py index 3dc09d95d..63f3a2790 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.4b1' +version = '1.4b2' # The full version, including alpha/beta/rc tags. release = version @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4b1', + version='1.4b2', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, |