From 1fb0ed58bb4b55a714b6bd9a29ac6ae1a47abbf7 Mon Sep 17 00:00:00 2001 From: Awais Jibran Date: Tue, 25 May 2021 12:09:37 +0500 Subject: [PATCH] chore: moving modal-config to constraints.txt (#27710) --- requirements/constraints.txt | 4 +++- requirements/edx/base.in | 2 +- requirements/edx/base.txt | 1 + requirements/edx/development.txt | 1 + requirements/edx/testing.txt | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 79eca438f8..c40c07b49e 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -26,6 +26,9 @@ PyJWT[crypto]<2.0.0 # social-auth-core>=4.0.0 requires PYJWT>=2.0.0 social-auth-core<4.0.0 +# We do not support version django-config-models<1.0.0 +django-config-models>=1.0.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 @@ -35,7 +38,6 @@ django-countries==5.5 # django-storages version 1.9 drops support for boto storage backend. django-storages<1.9 - # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 572be66566..c884102a4f 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -44,7 +44,7 @@ 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>=1.0.0 # Configuration models for Django allowing config management with auditing +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 django-crum # Middleware that stores the current request and user in thread local storage diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 288b3645c4..76c1e74ce9 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -170,6 +170,7 @@ django-classy-tags==2.0.0 # via django-sekizai django-config-models==2.1.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-enterprise # edx-event-routing-backends diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 67774630d2..3435173691 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -237,6 +237,7 @@ django-classy-tags==2.0.0 # django-sekizai django-config-models==2.1.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-enterprise # edx-event-routing-backends diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index c0fa074b4c..f68efb84bb 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -226,6 +226,7 @@ django-classy-tags==2.0.0 # django-sekizai django-config-models==2.1.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-enterprise # edx-event-routing-backends