Bumped up to version 2.2. Updated changelog.

This commit is contained in:
Martin Mahner 2013-12-18 11:41:39 +01:00
parent 15bb64fa3e
commit 983d8d1dc8
2 changed files with 11 additions and 5 deletions

View file

@ -1,9 +1,10 @@
dpaste Changelog Changelog
================ =========
2.2 (WIP) 2.2 (2013-12-18)
---------------- ----------------
* Added documentation: http://dpaste.readthedocs.org/en/latest/
* Added support for CSRF middleware * Added support for CSRF middleware
* Windows users can submit the form using Ctrl+Enter * Windows users can submit the form using Ctrl+Enter
* The raw view now sends the X-Content-Type-Options=nosniff header * The raw view now sends the X-Content-Type-Options=nosniff header

View file

@ -15,13 +15,18 @@ class Tox(TestCommand):
errno = tox.cmdline(self.test_args) errno = tox.cmdline(self.test_args)
exit(errno) exit(errno)
long_description = u'\n\n'.join((
open('README.rst').read(),
open('CHANGELOG').read()
))
setup( setup(
name='dpaste', name='dpaste',
version='2.1', version='2.2',
description='dpaste is a Django based pastebin. It\'s intended to run ' description='dpaste is a Django based pastebin. It\'s intended to run '
'separately but its also possible to be installed into an ' 'separately but its also possible to be installed into an '
'existing Django project like a regular app.', 'existing Django project like a regular app.',
long_description=open('README.rst').read(), long_description=long_description,
author='Martin Mahner', author='Martin Mahner',
author_email='martin@mahner.org', author_email='martin@mahner.org',
url='https://github.com/bartTC/dpaste/', url='https://github.com/bartTC/dpaste/',