diff options
| -rw-r--r-- | CHANGES.txt | 12 | ||||
| -rw-r--r-- | pyramid/registry.py | 2 | ||||
| -rw-r--r-- | setup.py | 20 |
3 files changed, 27 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 21ea2bb4a..1997c69de 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,15 @@ +Next release +============ + +Dependencies +------------ + +- Pyramid no longer depends on the zope.component package, except as a + testing dependency. + +- Pyramid now depends on a ``zope.interface`` version greater than or equal + to 3.8.0. + 1.2 (2011-09-12) ================ diff --git a/pyramid/registry.py b/pyramid/registry.py index 6b287e4f1..b88aabaff 100644 --- a/pyramid/registry.py +++ b/pyramid/registry.py @@ -1,4 +1,4 @@ -from zope.component.registry import Components +from zope.interface.registry import Components from pyramid.interfaces import ISettings @@ -34,19 +34,27 @@ install_requires=[ 'WebOb >= 1.0.2', # no "default_charset"; request.script_name doesnt error 'repoze.lru', 'setuptools', - 'zope.component >= 3.6.0', # independent of zope.hookable - 'zope.interface >= 3.5.1', # 3.5.0 comment: "allow to bootstrap on jython" + 'zope.interface >= 3.8.0', # has zope.interface.registry 'zope.deprecation', 'venusian >= 1.0a1', # ``onerror`` 'translationstring', ] if platform.system() == 'Java': - tests_require = install_requires + ['WebTest', 'virtualenv'] + tests_require = install_requires + [ + 'WebTest', + 'virtualenv', + 'zope.component>=3.11.0', + ] else: - tests_require= install_requires + ['Sphinx', 'docutils', - 'WebTest', 'repoze.sphinx.autointerface', - 'virtualenv'] + tests_require= install_requires + [ + 'Sphinx', + 'docutils', + 'repoze.sphinx.autointerface', + 'WebTest', + 'virtualenv', + 'zope.component>=3.11.0', + ] if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') |