Author: chrisz
Date: Sat Jan 26 07:08:47 2008
New Revision: 4055
URL: http://trac.turbogears.org/changeset/4055

Log:
Make sure we use CherryPy >= 2.3.0 (security fix).
Updated ez_setup.py to latest version.

Modified:
   branches/1.1/ez_setup.py
   branches/1.1/setup.py

Modified: branches/1.1/ez_setup.py
==============================================================================
--- branches/1.1/ez_setup.py    (original)
+++ branches/1.1/ez_setup.py    Sat Jan 26 07:08:47 2008
@@ -14,8 +14,8 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c5"
-DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/"; % 
sys.version[:3]
+DEFAULT_VERSION = "0.6c7"
+DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/"; % 
sys.version[:3]
 
 md5_data = {
     'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
@@ -39,6 +39,12 @@
     'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
     'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
     'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
+    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
+    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
+    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
+    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
+    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
 }
 
 import sys, os
@@ -221,3 +227,9 @@
         update_md5(sys.argv[2:])
     else:
         main(sys.argv[1:])
+
+
+
+
+
+

Modified: branches/1.1/setup.py
==============================================================================
--- branches/1.1/setup.py       (original)
+++ branches/1.1/setup.py       Sat Jan 26 07:08:47 2008
@@ -13,7 +13,7 @@
 
 # setup params
 install_requires = [
-    "CherryPy >= 2.2.1,<3.0.0alpha",
+    "CherryPy >= 2.3.0,<3.0.0alpha",
     "ConfigObj >= 4.3.2",
     "DecoratorTools >= 1.4",
     "FormEncode >= 0.7.1",
@@ -87,8 +87,8 @@
 TurboGears brings together four major pieces to create an
 easy to install, easy to use web megaframework. It covers
 everything from front end (MochiKit JavaScript for the browser,
-Genshi or Kid for templates in Python) to the controllers (CherryPy)
-to the back end (SQLAlchemy or SQLObject).
+Genshi/Kid/Mako/Cheetah for templates in Python) to the controllers
+(CherryPy) to the back end (SQLAlchemy or SQLObject).
 
 The TurboGears project is focused on providing documentation
 and integration with these tools without losing touch
@@ -99,6 +99,13 @@
 The latest development version is available in the
 `TurboGears subversion repository`_.
 
+Our `mailing list`_ is lively and helpful, don't hesitate to
+send your questions there, we will try to help you find out
+a solution to your problem.
+
+.. _mailing list:
+    http://groups.google.com/group/turbogears
+
 .. _TurboGears subversion repository:
     http://svn.turbogears.org/trunk#egg=turbogears-dev
 """,

Reply via email to