Final tweaks for 2.0.0-final releasecherrypy-2.0.0

5 files changed, 10 insertions, 24 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8fe21d9c..91e0b0dc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,5 @@
+2005-04-25:

+    * CherryPY-2.0-final released

     * Added tests about static content and httptools.redirect (Remi)

     * Handle %20 (and others) in static content - ticket #104 (Remi)

     * If y is a static dir make y/a?b try and serve a file named a?b (Dan)

@@ -9,7 +11,7 @@
     * Added form module (port from CP1 Form.cpy) (Remi)

     * Improved the way static files are being served (Remi)

 

-2004/12-29:

+2004-12-29:

     * CherryPY-2.0-beta released

     * xmlrpcfilter added (Remco)

     * cpg.response.body is now always an iterable type - ticket #59 (Carlos)

@@ -31,6 +33,6 @@
     * Added more unittest (Remi)

     * Fixed file upload bug (Remi)

 

-2004/10/13:

+2004-10-13:

     * First alpha release of CherryPy-2 (Remi)

 

diff --git a/MANIFEST.in b/MANIFEST.in
index c17f2305..af941520 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,6 @@
 include CHANGELOG.txt
 include CHERRYPYTEAM.txt
 include *.conf
+include cherrypy/tutorial/README.txt
+include cherrypy/test/style.css
+include cherrypy/test/static/index.html
diff --git a/README.txt b/README.txt
index af6f5e67..2c53f784 100644
--- a/README.txt
+++ b/README.txt
@@ -1,10 +1,10 @@
-* To install, just type:

+* To install, just type (python-2.3 or later needed):

 

     python setup.py install

 

 * To learn how to use it, look at the examples under cherrypy/tutorial/ or go to http://www.cherrypy.org for more info.

 

-* To run the unittest, just go to the cherrypy/test/ directory and type:

+* To run the regression tests, just go to the cherrypy/test/ directory and type:

 

     python test.py

 

diff --git a/cherrypy/tutorial/Readme2.txt b/cherrypy/tutorial/Readme2.txt
deleted file mode 100644
index 2b877e1f..00000000
--- a/cherrypy/tutorial/Readme2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-CherryPy Tutorials

-------------------------------------------------------------------------

-

-This is a series of tutorials explaining how to develop dynamic web

-applications using CherryPy. A couple of notes:

-

-  - Each of these tutorials builds on the ones before it. If you're

-    new to CherryPy, we recommend you start with 01_helloworld.py and

-    work your way upwards. :)

-

-  - In most of these tutorials, you will notice that all output is done

-    by returning normal Python strings, often using simple Python

-    variable substitution. In most real-world applications, you will

-    probably want to use a separate template package (like Cheetah,

-    CherryTemplate or XML/XSL).

-

diff --git a/setup.py b/setup.py
index bce7509a..3a1c9373 100644
--- a/setup.py
+++ b/setup.py
@@ -23,9 +23,6 @@ setup(name="CherryPy",
       url="http://www.cherrypy.org",
       license="BSD",
       packages=["cherrypy", "cherrypy.lib", "cherrypy.lib.filter", "cherrypy.tutorial", "cherrypy.test"],
-      download_url="http://trac.cherrypy.org/cgi-bin/trac.cgi/wiki/CherryPyDownload",
-      data_files=[('lib/site-packages/cherrypy/tutorial', ['cherrypy/tutorial/Readme.txt',

-                                         'cherrypy/tutorial/tutorial.conf'])]

-

+      download_url="http://www.cherrypy.org/wiki/CherryPyDownload",
 )