Commit 65437a95 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Improved our tests so that they don't raise an error if setuptools isn't... 

Improved our tests so that they don't raise an error if setuptools isn't installed, hence ridding the test suite of all dependencies. Also updated docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 345a0967

docs/contributing.txt

+2 −4
Original line number Diff line number Diff line
@@ -747,10 +747,8 @@ dependencies: 
    *  Docutils_

    *  setuptools_



Of these dependencies, setuptools_ is the only dependency that is required. If

setuptools_ is not installed, you'll get import errors when running one of

the template tests. The tests using the other dependencies will be skipped if the

particular library can't be found.

Each of these dependencies is optional. If you're missing any of them, the

associated tests will be skipped.



.. _PyYAML: http://pyyaml.org/wiki/PyYAML

.. _Markdown: http://pypi.python.org/pypi/Markdown/1.7

tests/regressiontests/templates/tests.py

+11 −8
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ from django.utils.tzinfo import LocalTimezone 
from unicode import unicode_tests

from context import context_tests



try:

    from loaders import *

except ImportError:

    pass # If setuptools isn't installed, that's fine. Just move on.



import filters