From 52b44f531d52008112e4ff83fe9ec7b00883b307 Mon Sep 17 00:00:00 2001 From: David Ormsbee <dave@edx.org> Date: Thu, 14 May 2020 13:55:11 -0400 Subject: [PATCH] Revert "Unpin django-cookies-samesite now that it declares ua-parser dep (#24000)" This reverts commit 27480a25f88cf7e92ed534629e8ba74fb45faa14. --- requirements/constraints.txt | 3 +++ requirements/edx/base.txt | 3 +-- requirements/edx/development.txt | 3 +-- requirements/edx/testing.txt | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 53256b0a863..785c6319633 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -19,6 +19,9 @@ ddt<1.4.0 # Stay on the latest LTS release of Django Django<2.3 +# Missing dependency declaration on ua-parser: https://github.com/jotes/django-cookies-samesite/issues/25 +django-cookies-samesite<0.6.0 + # The CORS_ORIGIN_WHITELIST changes in a backwards incompatible way in 3.0.0, needs matching configuration repo changes django-cors-headers<3.0.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b3864d8137a..c6479bb30f8 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -57,7 +57,7 @@ git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248e django-celery==3.3.1 # via -r requirements/edx/base.in django-classy-tags==1.0.0 # via django-sekizai django-config-models==2.0.2 # via -r requirements/edx/base.in, edx-enterprise -django-cookies-samesite==0.6.1 # via -r requirements/edx/base.in +django-cookies-samesite==0.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise django-crum==0.7.6 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring, edx-rbac, super-csv @@ -237,7 +237,6 @@ sympy==1.5.1 # via symmath testfixtures==6.14.1 # via edx-enterprise text-unidecode==1.3 # via python-slugify tqdm==4.46.0 # via -r requirements/edx/../edx-sandbox/shared.txt, nltk -ua-parser==0.10.0 # via django-cookies-samesite unicodecsv==0.14.1 # via -r requirements/edx/base.in, edx-enterprise uritemplate==3.0.1 # via coreapi, drf-yasg urllib3==1.25.9 # via -r requirements/edx/paver.txt, elasticsearch, geoip2, requests diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 027dc02b1b1..e89963694ab 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -68,7 +68,7 @@ git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248e django-celery==3.3.1 # via -r requirements/edx/testing.txt django-classy-tags==1.0.0 # via -r requirements/edx/testing.txt, django-sekizai django-config-models==2.0.2 # via -r requirements/edx/testing.txt, edx-enterprise -django-cookies-samesite==0.6.1 # via -r requirements/edx/testing.txt +django-cookies-samesite==0.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise django-crum==0.7.6 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv @@ -311,7 +311,6 @@ tox==3.15.0 # via -r requirements/edx/testing.txt, tox-battery tqdm==4.46.0 # via -r requirements/edx/testing.txt, nltk transifex-client==0.13.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt typed-ast==1.4.1 # via -r requirements/edx/testing.txt, astroid -ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-samesite unicodecsv==0.14.1 # via -r requirements/edx/testing.txt, edx-enterprise unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest-plugin uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index bce46ee5012..2f817202db8 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -67,7 +67,7 @@ git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248e django-celery==3.3.1 # via -r requirements/edx/base.txt django-classy-tags==1.0.0 # via -r requirements/edx/base.txt, django-sekizai django-config-models==2.0.2 # via -r requirements/edx/base.txt, edx-enterprise -django-cookies-samesite==0.6.1 # via -r requirements/edx/base.txt +django-cookies-samesite==0.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise django-crum==0.7.6 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv @@ -289,7 +289,6 @@ tox==3.15.0 # via -r requirements/edx/testing.in, tox-battery tqdm==4.46.0 # via -r requirements/edx/base.txt, nltk transifex-client==0.13.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in typed-ast==1.4.1 # via astroid -ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-samesite unicodecsv==0.14.1 # via -r requirements/edx/base.txt, edx-enterprise unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest-plugin uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg -- GitLab