[Checkins] SVN: grokcore.security/branches/1.2/ Ported setup.py dependency fixes from trunk.

[Reinout van Rees]

Log message for revision 106388:
  Ported setup.py dependency fixes from trunk.

Changed:
  U   grokcore.security/branches/1.2/CHANGES.txt
  U   grokcore.security/branches/1.2/buildout.cfg
  U   grokcore.security/branches/1.2/setup.py

-=-
Modified: grokcore.security/branches/1.2/CHANGES.txt
===================================================================
--- grokcore.security/branches/1.2/CHANGES.txt	2009-12-10 12:21:42 UTC (rev 106387)
+++ grokcore.security/branches/1.2/CHANGES.txt	2009-12-10 12:27:03 UTC (rev 106388)
@@ -6,6 +6,8 @@
 
 * Use zope.security instead of zope.app.security.
 
+* Ported setup.py dependency fixes from trunk.
+
 1.2 (2009-09-14)
 ----------------
 

Modified: grokcore.security/branches/1.2/buildout.cfg
===================================================================
--- grokcore.security/branches/1.2/buildout.cfg	2009-12-10 12:21:42 UTC (rev 106387)
+++ grokcore.security/branches/1.2/buildout.cfg	2009-12-10 12:27:03 UTC (rev 106388)
@@ -15,4 +15,5 @@
 [test]
 recipe = zc.recipe.testrunner
 eggs = grokcore.security
+       grokcore.security[test]
 defaults = ['--tests-pattern', '^f?tests$', '-v']

Modified: grokcore.security/branches/1.2/setup.py
===================================================================
--- grokcore.security/branches/1.2/setup.py	2009-12-10 12:21:42 UTC (rev 106387)
+++ grokcore.security/branches/1.2/setup.py	2009-12-10 12:27:03 UTC (rev 106388)
@@ -10,6 +10,11 @@
     read('CHANGES.txt')
     )
 
+tests_require = [
+    'zope.configuration',
+    'zope.testing',
+    ]
+
 setup(
     name='grokcore.security',
     version = '1.2',
@@ -32,12 +37,12 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=['setuptools',
+                      'grokcore.component >= 1.5.1',
                       'martian >= 0.10',
-                      'grokcore.component >= 1.5.1',
+                      'zope.component',
                       'zope.interface',
-                      'zope.component',
                       'zope.security',
-                      'zope.configuration',
-                      'zope.testing',
                       ],
+    tests_require=tests_require,
+    extras_require={'test': tests_require},
 )