From f97f71f59249f1fbeebe84d4fc858d70fc456f7d Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 10 Apr 2020 12:45:42 +0200 Subject: [PATCH] Refs #12990 -- Bumped mysqlclient requirement to >= 1.4.0. MySQLdb.constants.FIELD_TYPE.JSON was added in mysqlclient 1.4.0rc2. --- django/db/backends/mysql/base.py | 4 ++-- docs/ref/databases.txt | 2 +- docs/releases/3.1.txt | 3 +++ tests/requirements/mysql.txt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index eb0ba18cdad..44560ccdaf5 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -32,8 +32,8 @@ from .schema import DatabaseSchemaEditor # isort:skip from .validation import DatabaseValidation # isort:skip version = Database.version_info -if version < (1, 3, 13): - raise ImproperlyConfigured('mysqlclient 1.3.13 or newer is required; you have %s.' % Database.__version__) +if version < (1, 4, 0): + raise ImproperlyConfigured('mysqlclient 1.4.0 or newer is required; you have %s.' % Database.__version__) # MySQLdb returns TIME columns as timedelta -- they are more like timedelta in diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 391797d412a..f01a054d511 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -361,7 +361,7 @@ Connector/Python includes `its own`_. mysqlclient ~~~~~~~~~~~ -Django requires `mysqlclient`_ 1.3.13 or later. +Django requires `mysqlclient`_ 1.4.0 or later. MySQL Connector/Python ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt index 63607b4bdd2..a480cbfa570 100644 --- a/docs/releases/3.1.txt +++ b/docs/releases/3.1.txt @@ -690,6 +690,9 @@ Miscellaneous * The auto-reloader no longer monitors changes in built-in Django translation files. +* The minimum supported version of ``mysqlclient`` is increased from 1.3.13 to + 1.4.0. + .. _deprecated-features-3.1: Features deprecated in 3.1 diff --git a/tests/requirements/mysql.txt b/tests/requirements/mysql.txt index 9974ce0d367..df8a0230179 100644 --- a/tests/requirements/mysql.txt +++ b/tests/requirements/mysql.txt @@ -1 +1 @@ -mysqlclient >= 1.3.13 +mysqlclient >= 1.4.0