Preparing for the 1.1 release.

Cito · Cito · commit 60d29e08140b · 2011-08-14T11:57:11.000Z
diff --git a/DBUtils/Docs/UsersGuide.de.html b/DBUtils/Docs/UsersGuide.de.html
@@ -165,7 +165,7 @@ <h2>Installation als Unterpaket (Plug-In) von Webware for Python</h2>
 </div>
 <div class="section" id="anforderungen">
 <h1>Anforderungen</h1>
-<p>DBUtils arbeitet mit <a class="reference external" href="http://www.python.org">Python</a> 2.2 oder einer neueren Version von Python 2.
+<p>DBUtils arbeitet mit <a class="reference external" href="http://www.python.org">Python</a> 2.3 oder einer neueren Version von Python 2.
 Die Module in der Variante für klassisches PyGreSQL benötigen <a class="reference external" href="http://www.pygresql.org">PyGreSQL</a>
 Version 3.4 oder höher, während die Module in der allgemeinen Variante
 für DB-API 2 mit jedem beliebigen Python-Datenbankadapter-Modul
diff --git a/DBUtils/Docs/UsersGuide.de.txt b/DBUtils/Docs/UsersGuide.de.txt
@@ -106,7 +106,7 @@ wenn Sie DBUtils in die Webware-Dokumentation integrieren wollen::
 Anforderungen
 =============
 
-DBUtils arbeitet mit Python_ 2.2 oder einer neueren Version von Python 2.
+DBUtils arbeitet mit Python_ 2.3 oder einer neueren Version von Python 2.
 Die Module in der Variante für klassisches PyGreSQL benötigen PyGreSQL_
 Version 3.4 oder höher, während die Module in der allgemeinen Variante
 für DB-API 2 mit jedem beliebigen Python-Datenbankadapter-Modul
diff --git a/DBUtils/Docs/UsersGuide.html b/DBUtils/Docs/UsersGuide.html
@@ -164,7 +164,7 @@ <h2>Installation as a Webware for Python subpackage (plug-in)</h2>
 </div>
 <div class="section" id="requirements">
 <h1>Requirements</h1>
-<p>DBUtils runs with <a class="reference external" href="http://www.python.org">Python</a> 2.2 or newer Python 2 versions. The modules in
+<p>DBUtils runs with <a class="reference external" href="http://www.python.org">Python</a> 2.3 or newer Python 2 versions. The modules in
 the classic PyGreSQL variant need <a class="reference external" href="http://www.pygresql.org">PyGreSQL</a> version 3.4 or above, while the
 modules in the universal DB-API 2 variant run with any Python <a class="reference external" href="http://www.python.org/dev/peps/pep-0249/">DB-API 2</a>
 compliant database interface module.</p>
diff --git a/DBUtils/Docs/UsersGuide.txt b/DBUtils/Docs/UsersGuide.txt
@@ -105,7 +105,7 @@ integrate the DBUtils documentation into the Webware documentation::
 Requirements
 ============
 
-DBUtils runs with Python_ 2.2 or newer Python 2 versions. The modules in
+DBUtils runs with Python_ 2.3 or newer Python 2 versions. The modules in
 the classic PyGreSQL variant need PyGreSQL_ version 3.4 or above, while the
 modules in the universal DB-API 2 variant run with any Python `DB-API 2`_
 compliant database interface module.
diff --git a/DBUtils/PersistentDB.py b/DBUtils/PersistentDB.py
@@ -95,7 +95,7 @@
 
 Requirements:
 
-Python >= 2.2, < 3.0.
+Python >= 2.3, < 3.0.
 
 
 Ideas for improvement:
@@ -116,7 +116,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/PersistentPg.py b/DBUtils/PersistentPg.py
@@ -86,7 +86,7 @@
 
 Requirements:
 
-Python >= 2.2, < 3.0, PyGreSQL >= 3.4.
+Python >= 2.3, < 3.0, PyGreSQL >= 3.4.
 
 
 Ideas for improvement:
@@ -107,7 +107,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/PooledDB.py b/DBUtils/PooledDB.py
@@ -139,7 +139,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/PooledPg.py b/DBUtils/PooledPg.py
@@ -108,7 +108,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Properties.py b/DBUtils/Properties.py
@@ -1,14 +1,14 @@
 name = 'DBUtils'
 
-version = (1, 0, 0)
+version = (1, 1, 0)
 
 docs = [
     {'name': "User's Guide", 'file': 'UsersGuide.html'},
 ]
 
 status = 'beta'
 
-requiredPyVersion = (2, 2, 0)
+requiredPyVersion = (2, 3, 0)
 
 synopsis = """DBUtils provides database related support classes and functions to Webware. There is plenty of useful reusable code here."""
 
diff --git a/DBUtils/SimplePooledDB.py b/DBUtils/SimplePooledDB.py
@@ -73,7 +73,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/SimplePooledPg.py b/DBUtils/SimplePooledPg.py
@@ -68,7 +68,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/SteadyDB.py b/DBUtils/SteadyDB.py
@@ -90,7 +90,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/SteadyPg.py b/DBUtils/SteadyPg.py
@@ -70,7 +70,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestPersistentDB.py b/DBUtils/Tests/TestPersistentDB.py
@@ -11,7 +11,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestPersistentPg.py b/DBUtils/Tests/TestPersistentPg.py
@@ -11,7 +11,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestPooledDB.py b/DBUtils/Tests/TestPooledDB.py
@@ -11,7 +11,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestPooledPg.py b/DBUtils/Tests/TestPooledPg.py
@@ -11,7 +11,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestSimplePooledDB.py b/DBUtils/Tests/TestSimplePooledDB.py
@@ -12,7 +12,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestSimplePooledPg.py b/DBUtils/Tests/TestSimplePooledPg.py
@@ -11,7 +11,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestSteadyDB.py b/DBUtils/Tests/TestSteadyDB.py
@@ -10,7 +10,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestSteadyPg.py b/DBUtils/Tests/TestSteadyPg.py
@@ -12,7 +12,7 @@
 
 """
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/Tests/TestThreadingLocal.py b/DBUtils/Tests/TestThreadingLocal.py
@@ -1,6 +1,6 @@
 """Test the ThreadingLocal module."""
 
-__version__ = '1.0'
+__version__ = '1.1'
 __revision__ = "$Rev$"
 __date__ = "$Date$"
 
diff --git a/DBUtils/__init__.py b/DBUtils/__init__.py
@@ -5,7 +5,7 @@
     'SimplePooledDB', 'SteadyDB', 'PooledDB', 'PersistentDB'
 ]
 
-__version__ = '1.0'
+__version__ = '1.1'
 
 
 def InstallInWebKit(appServer):
diff --git a/Release.txt b/Release.txt
@@ -2,8 +2,9 @@ Create a new DBUtils release:
 =============================
 
 * Check the documentation. If possible, update all translations.
+  (Chinese translation was too old and has been removed for the time being.)
 
-* Run all tests in DBUtils/Tests with Python version from 2.2 to 2.6.
+* Run all tests in DBUtils/Tests with Python version from 2.3 to 2.7.
 
 * Check the examples in DBUtils/Examples with the current Webware version.
 
diff --git a/setup.py b/setup.py
@@ -1,3 +1,18 @@
+"""Setup Script for DBUtils"""
+
+__version__ = '1.1'
+__revision__ = "$Rev$"
+__date__ = "$Date$"
+
+from sys import version_info
+
+py_version = version_info[:2]
+if not (2, 7) <= py_version < (3, 0):
+    raise ImportError('Python %d.%d is not supported by DBUtils.' % py_version)
+
+import warnings
+warnings.filterwarnings('ignore', 'Unknown distribution option')
+
 try:
     from setuptools import setup
 except ImportError:
@@ -24,13 +39,6 @@
         except AttributeError:
             DistributionMetadata.zip_safe = None
 
-import warnings
-warnings.filterwarnings('ignore', 'Unknown distribution option')
-
-__version__ = '1.0'
-__revision__ = "$Rev$"
-__date__ = "$Date$"
-
 setup(
     name='DBUtils',
     version=__version__,
diff --git a/setversion.py b/setversion.py
@@ -13,10 +13,10 @@
 # releaseDate format should be 'MM/DD/YY'.
 
 # Update this to change the current version and release date:
-version = ('X', 'Y', 0)
-version = (1, 0, 0)
-releaseDate = '@@/@@/@@'
-releaseDate = '11/29/08'
+# version = ('X', 'Y', 0)
+version = (1, 1, 0)
+# releaseDate = '@@/@@/@@'
+releaseDate = '08/14/11'
 
 # Verbose output (output unchanged files also):
 verbose = False
