aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorcfdv <caldavis@gmail.com>2011-06-19 17:39:32 -0500
committercfdv <caldavis@gmail.com>2011-06-19 17:39:32 -0500
commit0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada (patch)
tree7a0936a9a83f9f39a090f96e41a274ac77ddaee4 /setup.py
parente8fda91bc2326911ea9a0197e595bc333540c282 (diff)
parent188240e312b8c5ff50bef276c97b36e5b3835f1e (diff)
downloadmediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.lz
mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.xz
mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.zip
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index ae5394eb..cd0e7f0b 100644
--- a/setup.py
+++ b/setup.py
@@ -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',