Prepare for v2.6 release.

Remove CHANGES.txt file and generate it as necessary.  Update
version numbers and remove setup.py version check.

CHANGES.txt

@@ -1,73 +0,0 @@
-Summary of changes
-==================
-
-2.6 (released 2008-xx-xx)
--------------------------
-
-Neil Schemenauer <nas@arctrix.com>:
-    Silence struct.pack warning by forcing gzipped response CRC to
-    look positive.
-
-
-2.5 (released 2007-11-16)
--------------------------
-
-Neil Schemenauer <nas@arctrix.com>:
-    Fix PTL handling of __future__ statements.
-
-
-2.5b1 (released 2007-04-05)
----------------------------
-
-C. Titus Brown <titus@idyll.org>:
-    Added some simple WSGI documentation; cleaned up test code a bit.
-
-C. Titus Brown <titus@idyll.org>:
-    Moved package contents into quixote/ subdirectory; added tests/
-    subdirectory with some minimal tests.
-
-C. Titus Brown <titus@idyll.org>:
-    Added quixote.html.use_qpy to switch Quixote over to using qpy
-    instead of htmltext.  (Code contributed by Mike Orr.)
-
-C. Titus Brown <titus@idyll.org>:
-    Added quixote.cleanup() to clear _publisher to support test fixtures.
-
-C. Titus Brown <titus@idyll.org>:
-    Added wsgi.py, quixote.get_wsgi_app() for WSGI support.
-
-Neil Schemenauer <nas@arctrix.com>:
-    In scgi_server.py, make the "host" default to "localhost" for
-    the run() function.
-
-Neil Schemenauer <nas@arctrix.com>:
-    Allow setup.py to work without the "quixote" package being
-    available.
-
-
-2.5a1 (released 2006-08-08)
--------------------------
-
-Neil Schemenauer <nas@arctrix.com>:
-    Update PTL to work with Python 2.5.
-
-Neil Schemenauer <nas@arctrix.com>:
-    In simple_server.py, ensure that server_close() gets called.
-
-Neil Schemenauer <nas@arctrix.com>:
-    Remove name="" from the noscript input tag rendered for
-    OptionSelectWidget.  This change does not seem to effect behavior
-    and makes Tidy happier.
-
-Neil Schemenauer <nas@arctrix.com>:
-    Add get_size() method to the Upload class.
-
-Neil Schemenauer <nas@arctrix.com>:
-    Remove Subversion keywords.  Update README.
-
-
-Older changes
-=============
-
-  See doc/CHANGES_24.txt for changes up to version 2.4.
-

quixote/__init__.py

@@ -3,7 +3,7 @@
 A highly Pythonic web application framework.
 """
 
-__version__ = '2.5'
+__version__ = '2.6'
 
 # These are frequently needed by Quixote applications.
 from quixote.publish import \

setup.py

@@ -14,16 +14,6 @@ from distutils.extension import Extension
 from quixote.ptl.qx_distutils import qx_build_py
 from quixote import __version__
 
-# Ensure that version number is correct.
-def _check_version_numbers():
-    import re
-    PAT = re.compile(r'^%s\b' % re.escape(__version__), re.MULTILINE)
-    if not PAT.search(open("CHANGES.txt").read(400)):
-        raise AssertionError("version number mismatch in CHANGES.txt")
-
-if 'sdist' in sys.argv[1:]:
-    _check_version_numbers()
-
 # a fast htmltext type
 htmltext = Extension(name="quixote.html._c_htmltext",
                      sources=["quixote/html/_c_htmltext.c"])
@@ -34,11 +24,11 @@ cimport = Extension(name="quixote.ptl.cimport",
 
 kw = {'name': "Quixote",
       'version': __version__,
-      'description': "A highly Pythonic Web application framework",
+      'description': "A small and flexible Python Web application framework",
       'author': "The Quixote developers",
       'author_email': "webmaster@quixote.ca",
       'url': "http://www.quixote.ca/",
-      'license': "DFSG approved open source (see LICENSE.txt)",
+      'license': "DFSG approved (see LICENSE.txt)",
 
       'package_dir': {'quixote': 'quixote'},
       'packages': ['quixote',  'quixote.demo', 'quixote.form',

tests/qx_testserver.py

@@ -3,9 +3,6 @@ A simple test server for testing Quixote functionality.
 """
 
 import os
-import quixote
-assert quixote.__version__ == '2.5a1'
-
 from quixote.publish import Publisher
 from quixote.directory import Directory