From 81bf0f75c93509bd3655df970896bf19e0f7da58 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 5 Oct 2021 16:50:14 +0500 Subject: [PATCH] chore: removing drf-jwt pin and checking tests. (#28516) * chore: removing drf-jwt pin. --- Makefile | 2 ++ requirements/common_constraints.txt | 2 +- requirements/edx/base.txt | 7 +++---- requirements/edx/development.txt | 4 ++-- requirements/edx/testing.txt | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 3f7117ea4e..806923af73 100644 --- a/Makefile +++ b/Makefile @@ -114,6 +114,8 @@ compile-requirements: $(COMMON_CONSTRAINTS_TXT) ## Re-compile *.in requirements mv requirements/common_constraints.tmp requirements/common_constraints.txt sed 's/edx-auth-backends<4.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp requirements/common_constraints.txt + sed 's/drf-jwt<1.19.1//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + mv requirements/common_constraints.tmp requirements/common_constraints.txt @ export REBUILD='--rebuild'; \ for f in $(REQ_FILES); do \ diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 92e893bc67..fb2cbbb9fd 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -32,7 +32,7 @@ Django<2.3 # latest version is causing e2e failures in edx-platform. # See comment. -drf-jwt<1.19.1 + # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c480ee57b1..63148caa44 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -381,10 +381,8 @@ docutils==0.17.1 # via botocore done-xblock==2.0.4 # via -r requirements/edx/base.in -drf-jwt==1.19.0 - # via - # -c requirements/edx/../common_constraints.txt - # edx-drf-extensions +drf-jwt==1.19.1 + # via edx-drf-extensions drf-yasg==1.20.0 # via edx-api-doc-tools edx-ace==1.3.1 @@ -426,6 +424,7 @@ edx-django-utils==4.4.0 # super-csv edx-drf-extensions==8.0.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-completion # edx-enterprise diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 102e23ef3e..f67492c491 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -479,9 +479,8 @@ docutils==0.17.1 # sphinx done-xblock==2.0.4 # via -r requirements/edx/testing.txt -drf-jwt==1.19.0 +drf-jwt==1.19.1 # via - # -c requirements/edx/../common_constraints.txt # -r requirements/edx/testing.txt # edx-drf-extensions drf-yasg==1.20.0 @@ -527,6 +526,7 @@ edx-django-utils==4.4.0 # super-csv edx-drf-extensions==8.0.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-completion # edx-enterprise diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 09d5ce1b49..15429c4e43 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -459,9 +459,8 @@ docutils==0.17.1 # botocore done-xblock==2.0.4 # via -r requirements/edx/base.txt -drf-jwt==1.19.0 +drf-jwt==1.19.1 # via - # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt # edx-drf-extensions drf-yasg==1.20.0 @@ -507,6 +506,7 @@ edx-django-utils==4.4.0 # super-csv edx-drf-extensions==8.0.0 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-completion # edx-enterprise