From e0357d53f530b46bf15d3ed879c7ceb6ecc1ae8d Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Wed, 26 Jun 2019 15:11:37 -0400 Subject: [PATCH] Bump Django to 2.2.2 --- docs/licenses/sqlparse.txt | 25 +++++++++++++++++++++++++ requirements/requirements.in | 2 +- requirements/requirements.txt | 3 ++- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 docs/licenses/sqlparse.txt diff --git a/docs/licenses/sqlparse.txt b/docs/licenses/sqlparse.txt new file mode 100644 index 000000000000..de414c557967 --- /dev/null +++ b/docs/licenses/sqlparse.txt @@ -0,0 +1,25 @@ +Copyright (c) 2016, Andi Albrecht +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the authors nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/requirements/requirements.in b/requirements/requirements.in index 7e080a64c41b..5adae509d001 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -7,7 +7,7 @@ channels==1.1.8 celery==4.3.0 daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade twisted[tls]>=17.1 # from daphne, see https://github.com/django/daphne/pull/257 -Django==2.1.9 +Django==2.2.2 django-auth-ldap==1.7.0 django-cors-headers==2.4.0 django-crum==0.7.2 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 72c1290dd45f..24ae822d0fec 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -35,7 +35,7 @@ django-radius==1.3.3 django-solo==1.1.3 django-split-settings==0.3.0 django-taggit==0.22.2 -django==2.1.9 +django==2.2.2 djangorestframework-yaml==1.0.3 djangorestframework==3.9.4 @@ -102,6 +102,7 @@ six==1.12.0 # via ansible-runner, asgi-amqp, asgiref, autobahn, au slackclient==1.1.2 social-auth-app-django==2.1.0 social-auth-core==3.0.0 +sqlparse==0.3.0 # via django tacacs_plus==1.0 tempora==1.14.1 # via irc, jaraco.logging twilio==6.10.4