From cdad78e6ee562f8f3acce065e396fb90d04180a1 Mon Sep 17 00:00:00 2001 From: Stephen Rauch Date: Tue, 5 Nov 2019 19:11:09 -0800 Subject: [PATCH] [2.2.x] Refs #30183 -- Doc'd dropping support for sqlparse < 0.2.2. Support for sqlparse < 0.2.2 was broken in 782d85b6dfa191e67c0f1d572641d8236c79174c because is_whitespace property was added in sqlparse 0.2.2. Backport of 4b6db766ba4b613d317c87f87d1d63865b7424a4 from master. --- docs/internals/contributing/writing-code/unit-tests.txt | 2 +- setup.py | 2 +- tests/requirements/py3.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt index 25a9a15ab8..16f2939e9f 100644 --- a/docs/internals/contributing/writing-code/unit-tests.txt +++ b/docs/internals/contributing/writing-code/unit-tests.txt @@ -243,7 +243,7 @@ dependencies: * memcached_, plus a :ref:`supported Python binding ` * gettext_ (:ref:`gettext_on_windows`) * selenium_ -* sqlparse_ (required) +* sqlparse_ 0.2.2+ (required) * tblib_ 1.5.0+ You can find these dependencies in `pip requirements files`_ inside the diff --git a/setup.py b/setup.py index 0dcfa47243..fd0104e7a7 100644 --- a/setup.py +++ b/setup.py @@ -83,7 +83,7 @@ setup( entry_points={'console_scripts': [ 'django-admin = django.core.management:execute_from_command_line', ]}, - install_requires=['pytz', 'sqlparse'], + install_requires=['pytz', 'sqlparse >= 0.2.2'], extras_require={ "bcrypt": ["bcrypt"], "argon2": ["argon2-cffi >= 16.1.0"], diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt index bb335791f4..e48303d3ed 100644 --- a/tests/requirements/py3.txt +++ b/tests/requirements/py3.txt @@ -12,5 +12,5 @@ pytz pywatchman; sys.platform != 'win32' PyYAML selenium -sqlparse +sqlparse >= 0.2.2 tblib >= 1.5.0