diff options
| author | Chris McDonough <chrism@plope.com> | 2012-12-10 21:45:27 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-12-10 21:45:27 -0500 |
| commit | 60eb090f768f48ff70b38e1846b0a6612e597f5a (patch) | |
| tree | 881b11b4861a1d261cdfb4522298eebd913396d3 | |
| parent | ecc2bd253e56e6a15a80f593bd193653211c9b49 (diff) | |
| parent | e609e19d028b1d714439188812ca3c9811e0a508 (diff) | |
| download | pyramid-60eb090f768f48ff70b38e1846b0a6612e597f5a.tar.gz pyramid-60eb090f768f48ff70b38e1846b0a6612e597f5a.tar.bz2 pyramid-60eb090f768f48ff70b38e1846b0a6612e597f5a.zip | |
Merge branch '1.4-branch'
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e7c6e2b24..1191347e6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,9 @@ +1.4b3 (2012-12-10) +================== + +- Packaging release only, no code changes. 1.4b2 was a brownbag release due to + missing directories in the tarball. + 1.4b2 (2012-12-10) ================== diff --git a/docs/conf.py b/docs/conf.py index 63f3a2790..0034f4286 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.4b2' +version = '1.4b3' # The full version, including alpha/beta/rc tags. release = version @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4b2', + version='1.4b3', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, |