back out the grokcore.component-2.0/martian-0.12 version requirements

CHANGES.txt

@@ -4,6 +4,14 @@ Changes
 1.4 (unreleased)
 ----------------
 
+* **note** Backed out the version requirements for
+  grokcore.component-2.0 and martian-0.12. These requirements
+  stood in the way of further development especially towards
+  grok-1.1 based on the ZTK. The 1.3 version should probably
+  have been called 2.0 like with grokcore.component.
+
+* Ported setup.py dependency fixes from trunk.
+
 * Use zope.security instead of zope.app.security.
 
 1.3 (2009-09-16)
@@ -12,7 +20,7 @@ Changes
 * Use the grok.zope.org/releaseinfo information instead of our own
   copy of ``versions.cfg``, for easier maintenance.
 
-* Depend on grokcore.component 2.0 and the 0.12 Martian - this changesw
+* Depend on grokcore.component 2.0 and the 0.12 Martian - this changes
   inheritance issues but doesn't appear to affect grokcore.security
   itself.
 

buildout.cfg

@@ -1,13 +1,11 @@
 [buildout]
-develop = .
 parts = interpreter test
 extends = http://grok.zope.org/releaseinfo/grok-1.1a1.cfg
 versions = versions
+develop = .
 
 [versions]
 grokcore.security =
-grokcore.component = 2.0
-martian = 0.12
 
 [interpreter]
 recipe = zc.recipe.egg

setup.py

@@ -37,8 +37,8 @@ def read(*rnames):
     include_package_data=True,
     zip_safe=False,
     install_requires=['setuptools',
-                      'grokcore.component >= 2.0',
-                      'martian >= 0.12',
+                      'grokcore.component >= 1.5.1',
+                      'martian >= 0.10',
                       'zope.component',
                       'zope.interface',
                       'zope.security',