[SQL-CVS] r4382 - in SQLObject/trunk: docs scripts

[<sub...@co...>]

Author: phd
Date: Mon Apr 18 13:03:30 2011
New Revision: 4382

Log:
Merged revision 4381 from branch 1.0: version 1.0 has already been released.

Modified:
   SQLObject/trunk/docs/TODO.txt
   SQLObject/trunk/scripts/sqlobject-convertOldURI

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Mon Apr 18 13:01:18 2011	(r4381)
+++ SQLObject/trunk/docs/TODO.txt	Mon Apr 18 13:03:30 2011	(r4382)
@@ -1,8 +1,6 @@
 TODO
 ----
 
-* Release 1.0.
-
 * Decorators @classmethod and @staticmethod.
 
 * Declare one encoding for all UnicodeCol's per table or even per connection.

Modified: SQLObject/trunk/scripts/sqlobject-convertOldURI
==============================================================================
--- SQLObject/trunk/scripts/sqlobject-convertOldURI	Mon Apr 18 13:01:18 2011	(r4381)
+++ SQLObject/trunk/scripts/sqlobject-convertOldURI	Mon Apr 18 13:03:30 2011	(r4382)
@@ -9,7 +9,7 @@
 
 try:
     import pkg_resources
-    pkg_resources.require('SQLObject>=1.0.0a1')
+    pkg_resources.require('SQLObject>=1.0.0')
 except (ImportError, pkg_resources.DistributionNotFound):
     pass