From 57a033d0ae5189704ce605f8dccc96f754522f74 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Wed, 22 Sep 2021 09:49:03 +0500 Subject: [PATCH] feat: Don't Use django-cookies-samesite on Django > 3.1 --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f02e210f0c..3f7117ea4e 100644 --- a/Makefile +++ b/Makefile @@ -130,13 +130,14 @@ compile-requirements: $(COMMON_CONSTRAINTS_TXT) ## Re-compile *.in requirements sed '/^[dD]jango==/d' requirements/edx/testing.txt > requirements/edx/testing.tmp mv requirements/edx/testing.tmp requirements/edx/testing.txt - # to avoid multiple entries copy this in tmp and remove it from django and django30. + # to avoid multiple entries remove it from django and django30 first and add later. sed -i '/^[dD]jango-cookies-samesite==/d' requirements/edx/django.txt sed -i '/^[dD]jango-cookies-samesite==/d' requirements/edx/django30.txt grep -e "^django-cookies-samesite==" requirements/edx/base.txt >> requirements/edx/django.txt grep -e "^django-cookies-samesite==" requirements/edx/base.txt >> requirements/edx/django30.txt - # removing django-cookies-samesite from all requirements files. It is not require for django32 + # removing django-cookies-samesite from all testing.txt file. It is not require for django32. + # at the time of django32 final upgrade job remove this package from base.in sed '/^[dD]jango-cookies-samesite==/d' requirements/edx/testing.txt > requirements/edx/testing.tmp mv requirements/edx/testing.tmp requirements/edx/testing.txt