[Checkins] SVN: zc.FileStorage/trunk/ - Added test extra to declare test dependency on ``zope.testing``.

[Michael Howitz]

Log message for revision 120250:
  - Added test extra to declare test dependency on ``zope.testing``.
  
  - Using Python's ``doctest`` module instead of depreacted ``zope.testing.doctest``.
  

Changed:
  U   zc.FileStorage/trunk/CHANGES.txt
  U   zc.FileStorage/trunk/buildout.cfg
  U   zc.FileStorage/trunk/setup.py
  U   zc.FileStorage/trunk/src/zc/FileStorage/tests.py

-=-
Modified: zc.FileStorage/trunk/CHANGES.txt
===================================================================
--- zc.FileStorage/trunk/CHANGES.txt	2011-02-10 07:36:16 UTC (rev 120249)
+++ zc.FileStorage/trunk/CHANGES.txt	2011-02-10 07:43:55 UTC (rev 120250)
@@ -1,5 +1,13 @@
+after 1.2.0
+===========
 
-1.2.0 (1010-05-21)
+- Added test extra to declare test dependency on ``zope.testing``.
+
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
+
+
+1.2.0 (2010-05-21)
 ==================
 
 - Now (ZODB 3.10) that the filestorage packer option can take
@@ -10,7 +18,7 @@
   record-transformation functions.  The primary use case for this is
   to use packing to compress storages not previously compressed.
 
-1.1.0 (1010-03-10)
+1.1.0 (2010-03-10)
 ==================
 
 - Improved use of posix_fadvise (where available)

Modified: zc.FileStorage/trunk/buildout.cfg
===================================================================
--- zc.FileStorage/trunk/buildout.cfg	2011-02-10 07:36:16 UTC (rev 120249)
+++ zc.FileStorage/trunk/buildout.cfg	2011-02-10 07:43:55 UTC (rev 120250)
@@ -9,7 +9,7 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zc.FileStorage
+eggs = zc.FileStorage [test]
 initialization =
   import os, tempfile, shutil
   if os.path.exists('tmp'): shutil.rmtree('tmp')

Modified: zc.FileStorage/trunk/setup.py
===================================================================
--- zc.FileStorage/trunk/setup.py	2011-02-10 07:36:16 UTC (rev 120249)
+++ zc.FileStorage/trunk/setup.py	2011-02-10 07:43:55 UTC (rev 120250)
@@ -21,6 +21,10 @@
     install_requires = ['setuptools',
                         'ZODB3 >=3.9dev'
                         ],
+    extras_require=dict(
+        test=[
+            'zope.testing',
+            ]),
     include_package_data = True,
     zip_safe = False,
     )

Modified: zc.FileStorage/trunk/src/zc/FileStorage/tests.py
===================================================================
--- zc.FileStorage/trunk/src/zc/FileStorage/tests.py	2011-02-10 07:36:16 UTC (rev 120249)
+++ zc.FileStorage/trunk/src/zc/FileStorage/tests.py	2011-02-10 07:43:55 UTC (rev 120250)
@@ -19,17 +19,18 @@
 # tests affected by the lack of gc in pack.
 ##############################################################################
 
+import ZODB.blob
+import ZODB.tests.testblob
+import doctest
 import pickle
 import unittest
 import zc.FileStorage
-import ZODB.blob
-import ZODB.tests.testblob
 
 from ZODB.tests.testFileStorage import * # :-P
 from ZODB.tests.PackableStorage import * # :-P
 from ZODB.tests.TransactionalUndoStorage import * # :-P
 
-from zope.testing import doctest, setupstack
+from zope.testing import setupstack
 
 class ZCFileStorageTests(FileStorageTests):