From 358e846768eda3b0700c9aad9fcd32e4ad09a7d8 Mon Sep 17 00:00:00 2001
From: Usama Sadiq <usama.sadiq@arbisoft.com>
Date: Mon, 30 Aug 2021 18:24:59 +0500
Subject: [PATCH] BOM-2747: Remove django-ipware constraint (#28529)

* fix: remove django-ipware constraint
---
 requirements/constraints.txt     | 4 ----
 requirements/edx/base.txt        | 5 ++---
 requirements/edx/development.txt | 5 ++---
 requirements/edx/testing.txt     | 5 ++---
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 330b1fedfc..9272c3aca2 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -100,10 +100,6 @@ jsonfield2<3.1.0        # jsonfield2 3.1.0 drops support for python 3.5
 # requirements of edx-platform. Pinning temporarily until this is resolved in edx-val.
 edxval<2.1
 
-# django-ipware==4.0.0 contains a critical change related to ip-handling which needs to be tested on sandbox
-# This constraint will be removed in https://openedx.atlassian.net/browse/BOM-2747
-django-ipware<4.0.0
-
 # pylint>=2.10.0 introduced a lot of new pylint warnings.
 # A separate PR will be needed to remove the pin and fix all the pylint warnings
 pylint<2.10.0
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 597b9a05ba..6f0a64db80 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -272,9 +272,8 @@ django-filter==2.4.0
     #   -r requirements/edx/base.in
     #   edx-enterprise
     #   lti-consumer-xblock
-django-ipware==3.0.7
+django-ipware==4.0.0
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
     #   edx-enterprise
     #   edx-proctoring
@@ -923,7 +922,7 @@ semantic-version==2.8.5
     # via edx-drf-extensions
 shapely==1.7.1
     # via -r requirements/edx/base.in
-simplejson==3.17.4
+simplejson==3.17.5
     # via
     #   -r requirements/edx/base.in
     #   sailthru-client
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index b7d0ef2339..97cda9e96b 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -354,9 +354,8 @@ django-filter==2.4.0
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   lti-consumer-xblock
-django-ipware==3.0.7
+django-ipware==4.0.0
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-proctoring
@@ -1288,7 +1287,7 @@ semantic-version==2.8.5
     #   edx-drf-extensions
 shapely==1.7.1
     # via -r requirements/edx/testing.txt
-simplejson==3.17.4
+simplejson==3.17.5
     # via
     #   -r requirements/edx/testing.txt
     #   sailthru-client
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 3f2a968383..b95abdd3bf 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -337,9 +337,8 @@ django-filter==2.4.0
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   lti-consumer-xblock
-django-ipware==3.0.7
+django-ipware==4.0.0
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
@@ -1211,7 +1210,7 @@ semantic-version==2.8.5
     #   edx-drf-extensions
 shapely==1.7.1
     # via -r requirements/edx/base.txt
-simplejson==3.17.4
+simplejson==3.17.5
     # via
     #   -r requirements/edx/base.txt
     #   sailthru-client