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
This commit is contained in:
parent
345a096756
commit
65437a95e1
|
@ -747,10 +747,8 @@ dependencies:
|
||||||
* Docutils_
|
* Docutils_
|
||||||
* setuptools_
|
* setuptools_
|
||||||
|
|
||||||
Of these dependencies, setuptools_ is the only dependency that is required. If
|
Each of these dependencies is optional. If you're missing any of them, the
|
||||||
setuptools_ is not installed, you'll get import errors when running one of
|
associated tests will be skipped.
|
||||||
the template tests. The tests using the other dependencies will be skipped if the
|
|
||||||
particular library can't be found.
|
|
||||||
|
|
||||||
.. _PyYAML: http://pyyaml.org/wiki/PyYAML
|
.. _PyYAML: http://pyyaml.org/wiki/PyYAML
|
||||||
.. _Markdown: http://pypi.python.org/pypi/Markdown/1.7
|
.. _Markdown: http://pypi.python.org/pypi/Markdown/1.7
|
||||||
|
|
|
@ -20,7 +20,10 @@ from django.utils.tzinfo import LocalTimezone
|
||||||
from unicode import unicode_tests
|
from unicode import unicode_tests
|
||||||
from context import context_tests
|
from context import context_tests
|
||||||
|
|
||||||
|
try:
|
||||||
from loaders import *
|
from loaders import *
|
||||||
|
except ImportError:
|
||||||
|
pass # If setuptools isn't installed, that's fine. Just move on.
|
||||||
|
|
||||||
import filters
|
import filters
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue