summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/news.txt10
-rw-r--r--setup.py20
2 files changed, 15 insertions, 15 deletions
diff --git a/docs/news.txt b/docs/news.txt
index 58071f1..9f90a39 100644
--- a/docs/news.txt
+++ b/docs/news.txt
@@ -3,15 +3,15 @@ News
.. contents::
-hg tip
-------
+2.0
+---
+
+* Experimental Python 3 support.
* paste now requires the six module.
* Drop support of Python 2.5 and older.
-* Experimental Python 3 support.
-
* Fixed ``egg:Paste#cgi``
* In ``paste.httpserver``: give a 100 Continue response even when the
@@ -23,7 +23,7 @@ hg tip
* Fixed parsing of paths beginning with multiple forward slashes.
-* Add tox.ini to run tests with tox.
+* Add tox.ini to run tests with tox on Python 2.6, 2.7 and 3.4.
1.7.5.1
-------
diff --git a/setup.py b/setup.py
index 2197f98..484eb7a 100644
--- a/setup.py
+++ b/setup.py
@@ -4,22 +4,22 @@
# - update version in setup.py (__version__)
# - update changelog: docs/news.txt
# - modify setup.py: set RELEASE to True
-# - check that "python setup.py sdist" contains all files tracked by
-# the SCM (Mercurial): update MANIFEST.in if needed
+# - check that "python setup.py sdist" contains all files tracked by
+# the SCM (Mercurial): update MANIFEST.in if needed
#
-# - hg ci
-# - hg tag VERSION
-# - hg push
-# - python setup.py register sdist bdist_wheel upload
+# - hg ci
+# - hg tag VERSION
+# - hg push
+# - python setup.py register sdist bdist_wheel upload
#
-# - increment version in setup.py (__version__)
-# - hg ci && hg push
+# - increment version in setup.py (__version__)
+# - hg ci && hg push
# If true, then the svn revision won't be used to calculate the
# revision (set to True for real releases)
-RELEASE = False
+RELEASE = True
-__version__ = '1.7.6'
+__version__ = '2.0'
from setuptools import setup, find_packages
import sys, os