From 6b462cdfdb44dc70b9785f35d2c853f415657475 Mon Sep 17 00:00:00 2001 From: jessicamack Date: Fri, 16 Aug 2024 18:54:59 -0400 Subject: [PATCH] Unpin django-guid and update license (#15381) unpin django-guid and update license there's no reason listed for the pin and the changelog doesn't describe any changes that should block a full upgrade. they changed licenses to MIT --- licenses/django-guid.txt | 40 +++++++++++++++-------------------- requirements/requirements.in | 2 +- requirements/requirements.txt | 2 +- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/licenses/django-guid.txt b/licenses/django-guid.txt index de842ea1c76d..61349f6e71d9 100644 --- a/licenses/django-guid.txt +++ b/licenses/django-guid.txt @@ -1,27 +1,21 @@ -Copyright (c) 2019 Jonas Krüger Svensson -All rights reserved. +MIT License -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +Copyright (c) 2023 Jonas Krüger Svensson & Sondre Lillebø Gundersen - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - * 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. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. - * 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 HOLDERS 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. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/requirements/requirements.in b/requirements/requirements.in index 43d5a67f3aa8..aa5b4116dc98 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -17,7 +17,7 @@ django-auth-ldap django-cors-headers django-crum django-extensions -django-guid==3.2.1 +django-guid django-oauth-toolkit<2.0.0 # Version 2.0.0 has breaking changes that will need to be worked out before upgrading django-polymorphic django-pglocks diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e6a71434eac0..1329fce4b1c9 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -150,7 +150,7 @@ django-crum==0.7.9 # django-ansible-base django-extensions==3.2.3 # via -r /awx_devel/requirements/requirements.in -django-guid==3.2.1 +django-guid==3.5.0 # via -r /awx_devel/requirements/requirements.in django-oauth-toolkit==1.7.1 # via -r /awx_devel/requirements/requirements.in