diff --git a/Makefile b/Makefile index 251b95672b..b7fc901704 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,8 @@ compile-requirements: $(COMMON_CONSTRAINTS_TXT) ## Re-compile *.in requirements # This is a temporary solution to override the real common_constraints.txt # In edx-lint, until the pyjwt constraint in edx-lint has been removed. # See BOM-2721 for more details. + sed 's/Django<2.3//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 \ @@ -122,17 +124,6 @@ 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 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 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 - upgrade: pre-requirements ## update the pip requirements files to use the latest releases satisfying our constraints $(MAKE) compile-requirements COMPILE_OPTS="--upgrade" diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ad097db621..3719b218a0 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,8 +15,8 @@ # celert>5.0.0 hasn't been tested yet, so the constraint will be removed after testing latest version celery<5.0.0 -# edx-platform currently only supported for Django 2.2.x -django<2.3 +# edx-platform currently only supported for Django 3.2.x +django<3.3 # Newer versions need celery >= 5.0 django-celery-results<2.1 diff --git a/requirements/edx/base.in b/requirements/edx/base.in index e21539410e..2ca76e88e8 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -43,7 +43,6 @@ defusedxml Django # Web application framework django-appconf django-celery-results # Only used for the CacheBackend for celery results -django-cookies-samesite # Middleware which allows SameSite=None flag for session and csrf cookies in Django<3.0.5 django-config-models # Configuration models for Django allowing config management with auditing django-cors-headers # Used to allow to configure CORS headers for cross-domain requests django-countries # Country data for Django forms and model fields