get rid of zope.index dependency, allow setup.py test to work by movi…

…ng code with import-time side effects to benchmark dir, change license header
Pylons · Jun 16, 2012 · 458d9ac · 458d9ac
1 parent ec5b7d0
commit 458d9ac
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/hypatia/indexes/text/tests/hs-tool.py → benchmark/hs-tool.py b/hypatia/indexes/text/tests/hs-tool.py → benchmark/hs-tool.py
diff --git a/hypatia/indexes/text/tests/mhindex.py → benchmark/mhindex.py b/hypatia/indexes/text/tests/mhindex.py → benchmark/mhindex.py
diff --git a/hypatia/indexes/text/tests/wordstats.py → benchmark/wordstats.py b/hypatia/indexes/text/tests/wordstats.py → benchmark/wordstats.py
diff --git a/hypatia/indexes/text/tests/test_index.py b/hypatia/indexes/text/tests/test_index.py
@@ -197,7 +197,7 @@ def _getBTreesFamily(self):
 class CosineIndexTest64(IndexTestBase, unittest.TestCase):
 
     def _getTargetClass(self):
-        from zope.index.text.cosineindex import CosineIndex
+        from hypatia.indexes.text.cosineindex import CosineIndex
         return CosineIndex
 
     def _getBTreesFamily(self):
@@ -207,7 +207,7 @@ def _getBTreesFamily(self):
 class OkapiIndexTest64(IndexTestBase, unittest.TestCase):
 
     def _getTargetClass(self):
-        from zope.index.text.okapiindex import OkapiIndex
+        from hypatia.indexes.text.okapiindex import OkapiIndex
         return OkapiIndex
 
     def _getBTreesFamily(self):

diff --git a/setup.py b/setup.py
@@ -1,14 +1,14 @@
 ##############################################################################
 #
-# Copyright (c) 2008 Agendaless Consulting and Contributors.
+# Copyright (c) 2012 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
-# This software is subject to the provisions of the BSD-like license at
+# This software is subject to the provisions of the Zope Public License,
-# http://www.repoze.org/LICENSE.txt.  A copy of the license should accompany
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# this distribution.  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO,
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FITNESS FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
 
@@ -52,16 +52,17 @@ def _unavailable(self, e):
         print >> sys.stderr, e
         print >> sys.stderr, '*' * 80
 
-
-
 try:
     here = os.path.abspath(os.path.dirname(__file__))
     README = open(os.path.join(here, 'README.rst')).read()
     CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 except IOError:
     README = CHANGES = ''
 
-install_requires = ['setuptools', 'zope.component', 'zope.index >= 3.5.0']
+install_requires = [
+    'ZODB3>=3.8',
+    'zope.interface',
+    ]
 
 testing_extras = ['nose', 'coverage']
 docs_extras = ['Sphinx']