From 3961fbae3078940f14557011952331da0b8bae86 Mon Sep 17 00:00:00 2001
From: "M. Zulqarnain" <zulqarnain.mailbox@gmail.com>
Date: Wed, 9 Jun 2021 19:08:49 +0500
Subject: [PATCH 1/4] chore: upgrade pip-tools

---
 requirements/constraints.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 892597ab2f5e..4fbbdc65845e 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -48,9 +48,6 @@ oauthlib==3.0.1
 # django-auth-toolkit==1.3.3 requires oauthlib>=3.1.0 which is pinned because of test failures
 django-oauth-toolkit<=1.3.2
 
-# ARCHBOM-1141: pip-tools upgrade requires pip upgrade
-pip-tools<6.0
-
 # Upgrading to 2.5.3 on 2020-01-03 triggered "'tzlocal' object has no attribute '_std_offset'" errors in production
 python-dateutil==2.4.0
 # matplotlib>=3.4.0 requires python-dateutil>=2.7

From c1e5bc48389f66947709bd3bb9fd9977ef98cc0a Mon Sep 17 00:00:00 2001
From: edX requirements bot
 <49161187+edx-requirements-bot@users.noreply.github.com>
Date: Wed, 9 Jun 2021 19:18:14 +0500
Subject: [PATCH 2/4] chore: Updating Python Requirements (#27897)

---
 requirements/edx/development.txt | 12 ++++++++----
 requirements/edx/pip-tools.txt   | 10 ++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 023584bd512e..07b47646189e 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -910,6 +910,10 @@ pbr==5.6.0
     # via
     #   -r requirements/edx/testing.txt
     #   stevedore
+pep517==0.10.0
+    # via
+    #   -r requirements/edx/pip-tools.txt
+    #   pip-tools
 piexif==1.1.3
     # via -r requirements/edx/testing.txt
 pillow==8.2.0
@@ -917,10 +921,8 @@ pillow==8.2.0
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-organizations
-pip-tools==5.5.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/pip-tools.txt
+pip-tools==6.1.0
+    # via -r requirements/edx/pip-tools.txt
 pluggy==0.13.1
     # via
     #   -r requirements/edx/testing.txt
@@ -1355,8 +1357,10 @@ tincan==1.0.0
     #   edx-event-routing-backends
 toml==0.10.2
     # via
+    #   -r requirements/edx/pip-tools.txt
     #   -r requirements/edx/testing.txt
     #   mypy
+    #   pep517
     #   pylint
     #   pytest
     #   pytest-cov
diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt
index e8264f7075fa..ac0b78950041 100644
--- a/requirements/edx/pip-tools.txt
+++ b/requirements/edx/pip-tools.txt
@@ -8,10 +8,12 @@ click==7.1.2
     # via
     #   -c requirements/edx/../constraints.txt
     #   pip-tools
-pip-tools==5.5.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/pip-tools.in
+pep517==0.10.0
+    # via pip-tools
+pip-tools==6.1.0
+    # via -r requirements/edx/pip-tools.in
+toml==0.10.2
+    # via pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

From 625ca65dbb0d6ad966dd70c590efd681e8204959 Mon Sep 17 00:00:00 2001
From: "M. Zulqarnain" <zulqarnain.mailbox@gmail.com>
Date: Tue, 15 Jun 2021 16:23:29 +0500
Subject: [PATCH 3/4] replace --no-index with --no-emit-index-url

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a87621496424..261206180791 100644
--- a/Makefile
+++ b/Makefile
@@ -97,8 +97,8 @@ compile-requirements: ## Re-compile *.in requirements to *.txt
 	for f in $(REQ_FILES); do \
 		echo ; \
 		echo "== $$f ===============================" ; \
-		echo "pip-compile -v --no-emit-trusted-host --no-index $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in"; \
-		pip-compile -v --no-emit-trusted-host --no-index $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in || exit 1; \
+		echo "pip-compile -v --no-emit-trusted-host --no-emit-index-url $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in"; \
+		pip-compile -v --no-emit-trusted-host --no-emit-index-url $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in || exit 1; \
 		export REBUILD=''; \
 	done
 	# Post process all of the files generated above to work around open pip-tools issues

From 7edb22097412547acf238e859154406751695b9a Mon Sep 17 00:00:00 2001
From: "M. Zulqarnain" <zulqarnain.mailbox@gmail.com>
Date: Tue, 15 Jun 2021 16:28:08 +0500
Subject: [PATCH 4/4] upgrade pip

---
 requirements/pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/pip.txt b/requirements/pip.txt
index b548e96f0cf5..d01924638d27 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -1,2 +1,2 @@
-pip==20.2.3
+pip==20.3.4
 wheel==0.35.1