diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-19 01:44:26 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-19 01:44:26 +0200 |
| commit | 76e21adbd8756159d83bef99b335398519b338f3 (patch) | |
| tree | 3c8c6b179cea2fa2ba70dc039ef2c0f63ab09a98 | |
| parent | d81b39da4c0f67b5f1c02da31f2c671aaca39624 (diff) | |
| parent | f2f3fe33e90ae7bc2f621bbd3cb003e098d130c8 (diff) | |
| download | mediagoblin-76e21adbd8756159d83bef99b335398519b338f3.tar.lz mediagoblin-76e21adbd8756159d83bef99b335398519b338f3.tar.xz mediagoblin-76e21adbd8756159d83bef99b335398519b338f3.zip | |
Merge remote-tracking branch 'gitorious/master'
| -rw-r--r-- | mediagoblin/tests/test_celery_setup.py | 2 | ||||
| -rw-r--r-- | setup.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py index 558eb458..2a7601c7 100644 --- a/mediagoblin/tests/test_celery_setup.py +++ b/mediagoblin/tests/test_celery_setup.py @@ -14,8 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import pkg_resources - from mediagoblin import celery_setup @@ -42,6 +42,7 @@ setup( 'translitcodec', 'argparse', 'webtest', + 'lxml', ], test_suite='nose.collector', |