Commits

Olemis Lang  committed fa35ee8

TracGViz: Select the right RPC package (BH vs Trac) and postpone separation of test deps

  • Participants
  • Parent commits edbb69d

Comments (0)

Files changed (1)

File trac-dev/gviz/setup.py

                tracgviz.ig = tracgviz.ig
                """
 
+try:
+    import multiproduct
+except ImportError:
+    rpcpkg = 'TracXMLRPC'
+else:
+    rpcpkg = 'BloodhoundRPC'
+
 setup(
     name=DIST_NM,
     version=latest,
     description=DESC.split('\n', 1)[0],
     author='Olemis Lang',
-    author_email='olemis@gmail.com',
+    author_email='olemis+trac@gmail.com',
     maintainer='Olemis Lang',
     maintainer_email='olemis+trac@gmail.com',
     url='https://dataviz.blood-hound.net/wiki/Packages/%s' % (DIST_NM,),
     download_url='http://pypi.python.org/packages/2.6/%s/%s/%s-%s-py2.6.egg' % \
                                   (DIST_NM[0], DIST_NM, DIST_NM, latest,),
-    requires = ['trac', 'tracrpc', 'gviz_api', 'pygments', 'dutest'],
+    requires = ['trac', 'tracrpc', 'gviz_api', 'pygments'],
     install_requires = ['setuptools>=0.6b1',
                         'Trac>=0.11',
+                        'dutest>=0.2.4',
+                        'dutest-trac',
                         'Pygments>=1.0',
-                        'TracXMLRPC',
+                        rpcpkg,
                         'PyICU',],
-    tests_require = ['dutest>=0.2.4',
-                     'dutest-trac',],
+#    tests_require = ['dutest>=0.2.4',
+#                     'dutest-trac',],
     package_dir = dict([p, i[0]] for p, i in PKG_INFO.iteritems()),
     packages = PKG_INFO.keys(),
     package_data = dict([p, i[1]] for p, i in PKG_INFO.iteritems()),