diff options
author | cfdv <caldavis@gmail.com> | 2011-06-19 17:20:23 -0500 |
---|---|---|
committer | cfdv <caldavis@gmail.com> | 2011-06-19 17:20:23 -0500 |
commit | cd95cb6d3d6ffa403be5f2b347862929917aa1e3 (patch) | |
tree | 07c7625b589437c927bc0eaa9ed4cdc27f9257d5 /setup.py | |
parent | 699b5475806c43af339d48408a7ea04ae9027c1a (diff) | |
parent | 188240e312b8c5ff50bef276c97b36e5b3835f1e (diff) | |
download | mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.tar.lz mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.tar.xz mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.zip |
Merge remote-tracking branch 'origin/master' into is315
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -42,7 +42,10 @@ setup( 'translitcodec', 'argparse', 'webtest', - 'lxml', + 'ConfigObj', + ## For now we're expecting that users will install this from + ## their package managers. + # 'lxml', ], test_suite='nose.collector', |