diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2017-03-21 17:23:17 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2017-03-21 17:40:04 +0100 |
| commit | b06855facdd0fd1eecae7bce75c815c8a6af19b6 (patch) | |
| tree | 99bb161d631084543d20cc1823a6450097bac04f /docs | |
| parent | a937785e2a6eb3d9b8804c3a02ba5d0126482f57 (diff) | |
[1.11.x] Fixed #27966 -- Bumped required psycopg2 version to 2.5.4.
Thanks Tim Graham for the review.
Backport of 43380e911073beab401a2fdeca0f25001e170dac from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/contrib/postgres/fields.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/postgres/index.txt | 3 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 4 | ||||
| -rw-r--r-- | docs/releases/1.11.txt | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/ref/contrib/postgres/fields.txt b/docs/ref/contrib/postgres/fields.txt index cfce65420f..f384f5829c 100644 --- a/docs/ref/contrib/postgres/fields.txt +++ b/docs/ref/contrib/postgres/fields.txt @@ -517,7 +517,7 @@ using in conjunction with lookups on of the JSON which allows indexing. The trade-off is a small additional cost on writing to the ``jsonb`` field. ``JSONField`` uses ``jsonb``. - **As a result, this field requires PostgreSQL ≥ 9.4 and Psycopg2 ≥ 2.5.4**. + **As a result, this field requires PostgreSQL ≥ 9.4**. Querying ``JSONField`` ---------------------- diff --git a/docs/ref/contrib/postgres/index.txt b/docs/ref/contrib/postgres/index.txt index 5a212fbdcd..9485f56409 100644 --- a/docs/ref/contrib/postgres/index.txt +++ b/docs/ref/contrib/postgres/index.txt @@ -9,9 +9,6 @@ PostgreSQL has a number of features which are not shared by the other databases Django supports. This optional module contains model fields and form fields for a number of PostgreSQL specific data types. -Psycopg2 2.5 or higher is required, though we highly recommend using the latest -release. Some fields require higher versions. - .. note:: Django is, and will continue to be, a database-agnostic web framework. We would encourage those writing reusable applications for the Django diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 8032c36045..cf2f924dd7 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -92,8 +92,8 @@ below for information on how to set up your database correctly. PostgreSQL notes ================ -Django supports PostgreSQL 9.3 and higher. It requires the use of `psycopg2`_ -2.4.5 or higher (or 2.5+ if you want to use :mod:`django.contrib.postgres`). +Django supports PostgreSQL 9.3 and higher. `psycopg2`_ 2.5.4 or higher is +required, though the latest release is recommended. .. _psycopg2: http://initd.org/psycopg/ diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt index 9a340de0dd..c7181e57f9 100644 --- a/docs/releases/1.11.txt +++ b/docs/releases/1.11.txt @@ -521,6 +521,9 @@ Django 1.11 sets PostgreSQL 9.3 as the minimum version it officially supports. Support for PostGIS 2.0 is also removed as PostgreSQL 9.2 is the last version to support it. +Also, the minimum supported version of psycopg2 is increased from 2.4.5 to +2.5.4. + ``LiveServerTestCase`` binds to port zero ----------------------------------------- |