[Checkins] SVN: relstorage/trunk/ Integrated setuptools.
Shane Hathaway
shane at hathawaymix.org
Wed Feb 27 17:24:47 EST 2008
Log message for revision 84355:
Integrated setuptools.
Changed:
U relstorage/trunk/CHANGELOG.txt
A relstorage/trunk/relstorage/tests/alltests.py
U relstorage/trunk/setup.py
-=-
Modified: relstorage/trunk/CHANGELOG.txt
===================================================================
--- relstorage/trunk/CHANGELOG.txt 2008-02-27 22:23:46 UTC (rev 84354)
+++ relstorage/trunk/CHANGELOG.txt 2008-02-27 22:24:46 UTC (rev 84355)
@@ -1,11 +1,13 @@
-RelStorage 1.0
+RelStorage 1.0c1
- The previous fix for non-ASCII characters was incorrect. Now transaction
metadata is stored as raw bytes. A schema migration is required; see
notes/migrate-1.0-beta.txt.
+- Integrated setuptools and made an egg.
+
RelStorage 1.0 beta
- Renamed to reflect expanding database support.
Added: relstorage/trunk/relstorage/tests/alltests.py
===================================================================
--- relstorage/trunk/relstorage/tests/alltests.py (rev 0)
+++ relstorage/trunk/relstorage/tests/alltests.py 2008-02-27 22:24:46 UTC (rev 84355)
@@ -0,0 +1,27 @@
+##############################################################################
+#
+# Copyright (c) 2008 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Combines the tests of all adapters"""
+
+import unittest
+
+from testpostgresql import test_suite as postgresql_test_suite
+from testmysql import test_suite as mysql_test_suite
+from testoracle import test_suite as oracle_test_suite
+
+def make_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(postgresql_test_suite())
+ suite.addTest(mysql_test_suite())
+ suite.addTest(oracle_test_suite())
+ return suite
Modified: relstorage/trunk/setup.py
===================================================================
--- relstorage/trunk/setup.py 2008-02-27 22:23:46 UTC (rev 84354)
+++ relstorage/trunk/setup.py 2008-02-27 22:24:46 UTC (rev 84355)
@@ -27,7 +27,7 @@
with RelStorage.
"""
-VERSION = "1.0-beta1"
+VERSION = "1.0c1"
classifiers = """\
Development Status :: 4 - Beta
@@ -40,9 +40,23 @@
Operating System :: Unix
"""
+try:
+ from setuptools import setup
+except ImportError:
+ from distutils import setup
+ setuptools_args = {}
+else:
+ setuptools_args = dict(
+ zip_safe=False, # otherwise ZConfig can't see component.xml
+ install_requires=['ZODB3>=3.7.0'],
+ extras_require={
+ 'mysql': ['MySQL-python>=1.2.2'],
+ 'postgresql': ['psycopg2>=2.0'],
+ 'oracle': ['cx_Oracle>=4.3.1'],
+ },
+ test_suite='relstorage.tests.alltests.make_suite',
+ )
-from distutils.core import setup
-
doclines = __doc__.split("\n")
setup(
@@ -60,4 +74,5 @@
description=doclines[0],
classifiers=filter(None, classifiers.split("\n")),
long_description = "\n".join(doclines[2:]),
+ **setuptools_args
)
More information about the Checkins
mailing list