[Checkins] SVN: z3c.pt/trunk/ - Make lxml a setuptools "extra". To install with lxml support

[Chris McDonough]

Log message for revision 89778:
  - Make lxml a setuptools "extra".  To install with lxml support
    (currently required by Genshi), specify "z3c.pt [lxml]" in
    any references you need to make to the package in buildout or
    in setup.py install_requires.  [chrism]
  
  - Add test-nolxml and py-nolxml parts to buildout so the package's
    tests can be run without lxml.  [chrism]  
  
  

Changed:
  U   z3c.pt/trunk/CHANGES.txt
  U   z3c.pt/trunk/buildout.cfg
  U   z3c.pt/trunk/setup.py

-=-
Modified: z3c.pt/trunk/CHANGES.txt
===================================================================
--- z3c.pt/trunk/CHANGES.txt	2008-08-13 04:24:52 UTC (rev 89777)
+++ z3c.pt/trunk/CHANGES.txt	2008-08-13 04:30:44 UTC (rev 89778)
@@ -4,6 +4,14 @@
 Version 1.0dev
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+- Make lxml a setuptools "extra".  To install with lxml support
+  (currently required by Genshi), specify "z3c.pt [lxml]" in
+  any references you need to make to the package in buildout or
+  in setup.py install_requires.  [chrism]
+
+- Add test-nolxml and py-nolxml parts to buildout so the package's
+  tests can be run without lxml.  [chrism]  
+
 - CDATA sections are now correctly handled when using the
   ElementTree-parser. [malthe]
 

Modified: z3c.pt/trunk/buildout.cfg
===================================================================
--- z3c.pt/trunk/buildout.cfg	2008-08-13 04:24:52 UTC (rev 89777)
+++ z3c.pt/trunk/buildout.cfg	2008-08-13 04:30:44 UTC (rev 89778)
@@ -3,12 +3,23 @@
     .
     benchmark
 
-parts = test benchmark py
+parts =
+    test
+    test-nolxml
+    benchmark
+    py
+    py-nolxml
 
 [test]
 recipe = zc.recipe.testrunner
 environment = test-environment
 eggs =
+   z3c.pt [lxml]
+
+[test-nolxml]
+recipe = zc.recipe.testrunner
+environment = test-environment
+eggs =
    z3c.pt
 
 [test-environment]
@@ -18,7 +29,7 @@
 recipe = zc.recipe.testrunner
 environment = benchmark-environment
 eggs =
-   z3c.pt
+   z3c.pt [lxml]
    benchmark
 
 [benchmark-environment]
@@ -27,9 +38,17 @@
 
 [py]
 recipe = zc.recipe.egg
-eggs = ${benchmark:eggs}
-       Sphinx
+eggs = 
+    z3c.pt [lxml]
+    benchmark
+    Sphinx
 interpreter = py
 environment = benchmark-environment
-scripts = py
-          sphinx-build
+scripts = sphinx-build
+
+[py-nolxml]
+recipe = zc.recipe.egg
+eggs =
+    z3c.pt
+interpreter = py-nolxml
+environment = benchmark-environment

Modified: z3c.pt/trunk/setup.py
===================================================================
--- z3c.pt/trunk/setup.py	2008-08-13 04:24:52 UTC (rev 89777)
+++ z3c.pt/trunk/setup.py	2008-08-13 04:30:44 UTC (rev 89778)
@@ -1,7 +1,19 @@
 from setuptools import setup, find_packages
-
+import sys
 version = '1.0dev'
 
+install_requires = [
+    'setuptools',
+    'zope.interface',
+    'zope.component',
+    'zope.i18n >= 3.5',
+    'zope.traversing',
+    'zope.security',
+    ]
+
+if sys.version_info[:3] < (2,5,0):
+    install_requires.append('elementtree')
+
 setup(name='z3c.pt',
       version=version,
       description="Python template compiler which supports the Genshi and "
@@ -24,13 +36,6 @@
       package_dir = {'':'src'},
       include_package_data=True,
       zip_safe=False,
-      install_requires=[
-          'setuptools',
-          'lxml',
-          'zope.interface',
-          'zope.component',
-          'zope.i18n >= 3.5',
-          'zope.traversing',
-          'zope.security',
-      ],
+      install_requires=install_requires,
+      extras_require={'lxml':['lxml']},
       )