summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-11-09 19:09:36 -0500
committerGitHub <noreply@github.com>2018-11-09 19:09:36 -0500
commitf82be9ebc79e30fef796bbc61fec4b9694cb779f (patch)
treec4a5907223c04a3f005612543abea418234afe5c /docs
parentf9ff1df1daac8ae1fc22b27f48735148cb5488dd (diff)
Fixed #29934 -- Added sqlparse as a require dependency.
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/contributing/writing-code/unit-tests.txt2
-rw-r--r--docs/ref/migration-operations.txt5
-rw-r--r--docs/releases/2.2.txt7
3 files changed, 9 insertions, 5 deletions
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index 973ed27644..c3af1cd02f 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -233,7 +233,7 @@ dependencies:
* memcached_, plus a :ref:`supported Python binding <memcached>`
* gettext_ (:ref:`gettext_on_windows`)
* selenium_
-* sqlparse_
+* sqlparse_ (required)
You can find these dependencies in `pip requirements files`_ inside the
``tests/requirements`` directory of the Django source tree and install them
diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt
index c117145fde..2aaabab720 100644
--- a/docs/ref/migration-operations.txt
+++ b/docs/ref/migration-operations.txt
@@ -240,8 +240,7 @@ partial indexes.
``sql``, and ``reverse_sql`` if provided, should be strings of SQL to run on
the database. On most database backends (all but PostgreSQL), Django will
-split the SQL into individual statements prior to executing them. This
-requires installing the sqlparse_ Python library.
+split the SQL into individual statements prior to executing them.
You can also pass a list of strings or 2-tuples. The latter is used for passing
queries and parameters in the same way as :ref:`cursor.execute()
@@ -294,8 +293,6 @@ be removed (elided) when :ref:`squashing migrations <migration-squashing>`.
want the operation not to do anything in the given direction. This is
especially useful in making the operation reversible.
-.. _sqlparse: https://pypi.org/project/sqlparse/
-
``RunPython``
-------------
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 37ef7fd3a8..4dd3c72e20 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -330,6 +330,13 @@ properly (the database was empty at the end of the whole test suite). This
change shouldn't have an impact on your tests unless you've customized
:class:`~django.test.TransactionTestCase`'s internals.
+``sqlparse`` is required dependency
+-----------------------------------
+
+To simplify a few parts of Django's database handling, `sqlparse
+<https://pypi.org/project/sqlparse/>`_ is now a required dependency. It's
+automatically installed along with Django.
+
Miscellaneous
-------------