From e33de26e6aa6d3091f7e926300406c3637ae3af6 Mon Sep 17 00:00:00 2001
From: edX requirements bot
 <49161187+edx-requirements-bot@users.noreply.github.com>
Date: Wed, 22 Jul 2020 12:55:28 -0400
Subject: [PATCH] Python Requirements Update (#24563)

* Updating Python Requirements

* pin maxminddb

Co-authored-by: Zulqarnain <muhammad.zulqarnain@arbisoft.com>
---
 requirements/constraints.txt     | 3 +++
 requirements/edx/base.txt        | 4 ++--
 requirements/edx/development.txt | 4 ++--
 requirements/edx/testing.txt     | 4 ++--
 scripts/xblock/requirements.txt  | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 947205c69b3..00dbef21d39 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -76,6 +76,9 @@ Markdown==2.6.11
 # Matplotlib 3.1 requires Python 3.6
 matplotlib<3.1
 
+# Version 2.0.0 is breaking quality tests, See https://openedx.atlassian.net/browse/BOM-1949 for reference
+maxminddb<2.0.0
+
 # mock version 4.0.0 drops support for python 3.5
 mock<4.0.0
 
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 51d415448c8..45097f30e1e 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -97,7 +97,7 @@ edx-celeryutils==0.5.1    # via -r requirements/edx/base.in, super-csv
 edx-completion==3.2.4     # via -r requirements/edx/base.in
 edx-django-release-util==0.4.4  # via -r requirements/edx/base.in
 edx-django-sites-extensions==2.5.1  # via -r requirements/edx/base.in
-edx-django-utils==3.3.0   # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
+edx-django-utils==3.4.0   # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
 edx-drf-extensions==6.1.1  # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
 edx-enterprise==3.4.26    # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
 edx-i18n-tools==0.5.3     # via ora2
@@ -152,7 +152,7 @@ mako==1.1.3               # via -r requirements/edx/base.in, acid-xblock, lti-co
 markdown==2.6.11          # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-wiki, staff-graded-xblock, xblock-poll
 markey==0.8               # via enmerkar-underscore
 markupsafe==1.1.1         # via -r requirements/edx/paver.txt, chem, jinja2, mako, xblock
-maxminddb==1.5.4          # via geoip2
+maxminddb==1.5.4          # via -c requirements/edx/../constraints.txt, geoip2
 mock==3.0.5               # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, xblock-drag-and-drop-v2, xblock-poll
 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2  # via -r requirements/edx/github.in
 mongoengine==0.20.0       # via -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 1596be7e746..93be20475b7 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -109,7 +109,7 @@ edx-celeryutils==0.5.1    # via -r requirements/edx/testing.txt, super-csv
 edx-completion==3.2.4     # via -r requirements/edx/testing.txt
 edx-django-release-util==0.4.4  # via -r requirements/edx/testing.txt
 edx-django-sites-extensions==2.5.1  # via -r requirements/edx/testing.txt
-edx-django-utils==3.3.0   # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
+edx-django-utils==3.4.0   # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
 edx-drf-extensions==6.1.1  # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
 edx-enterprise==3.4.26    # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
 edx-i18n-tools==0.5.3     # via -r requirements/edx/testing.txt, ora2
@@ -185,7 +185,7 @@ mando==0.6.4              # via -r requirements/edx/testing.txt, radon
 markdown==2.6.11          # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-wiki, staff-graded-xblock, xblock-poll
 markey==0.8               # via -r requirements/edx/testing.txt, enmerkar-underscore
 markupsafe==1.1.1         # via -r requirements/edx/testing.txt, chem, jinja2, mako, xblock
-maxminddb==1.5.4          # via -r requirements/edx/testing.txt, geoip2
+maxminddb==1.5.4          # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, geoip2
 mccabe==0.6.1             # via -r requirements/edx/testing.txt, flake8, pylint
 mistune==0.8.4            # via m2r
 mock==3.0.5               # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 6b26e78e10d..4aa63aea1e8 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -106,7 +106,7 @@ edx-celeryutils==0.5.1    # via -r requirements/edx/base.txt, super-csv
 edx-completion==3.2.4     # via -r requirements/edx/base.txt
 edx-django-release-util==0.4.4  # via -r requirements/edx/base.txt
 edx-django-sites-extensions==2.5.1  # via -r requirements/edx/base.txt
-edx-django-utils==3.3.0   # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
+edx-django-utils==3.4.0   # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when
 edx-drf-extensions==6.1.1  # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
 edx-enterprise==3.4.26    # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
 edx-i18n-tools==0.5.3     # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2
@@ -178,7 +178,7 @@ mando==0.6.4              # via radon
 markdown==2.6.11          # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-wiki, staff-graded-xblock, xblock-poll
 markey==0.8               # via -r requirements/edx/base.txt, enmerkar-underscore
 markupsafe==1.1.1         # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, chem, jinja2, mako, xblock
-maxminddb==1.5.4          # via -r requirements/edx/base.txt, geoip2
+maxminddb==1.5.4          # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, geoip2
 mccabe==0.6.1             # via flake8, pylint
 mock==3.0.5               # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, xblock-drag-and-drop-v2, xblock-poll
 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2  # via -r requirements/edx/base.txt
diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt
index b6d9a3a71e6..47f4334eda3 100644
--- a/scripts/xblock/requirements.txt
+++ b/scripts/xblock/requirements.txt
@@ -8,4 +8,4 @@ certifi==2020.6.20        # via requests
 chardet==3.0.4            # via requests
 idna==2.10                # via requests
 requests==2.24.0          # via -r scripts/xblock/requirements.in
-urllib3==1.25.9           # via requests
+urllib3==1.25.10          # via requests
-- 
GitLab