From 171255860fc9ac3a97036bfae14dd27c87722a73 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Wed, 5 Jul 2023 15:52:41 -0400
Subject: [PATCH] feat: Unpin SAML for upgrade. (#32443)

https://github.com/openedx/edx-platform/issues/32327
---
 requirements/constraints.txt     | 8 --------
 requirements/edx/base.txt        | 8 +++-----
 requirements/edx/development.txt | 8 +++-----
 requirements/edx/testing.txt     | 8 +++-----
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index fa4cc231c3..f265bb630c 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -109,14 +109,6 @@ urllib3<2.0.0
 # Issue to unpin Sphinx to resolve this constraint: https://github.com/openedx/edx-lint/issues/338
 docutils<0.20
 
-# When we unpinned python3-saml and allowed it to upgrade from 1.9.0
-# to 1.15.0 it fixed a devstack issue around ports being dropped, but
-# introduced an issue around duplicate attributes (for some
-# IdPs). It's not clear which version introduces the second problem.
-#
-# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32327
-python3-saml<1.10.0
-
 # greater version has dropped few dependencies. Fix this in other ticket.
 drf-yasg<1.21.6
 
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 409588e795..82da2d3df3 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -170,7 +170,6 @@ defusedxml==0.7.1
     #   djangorestframework-xml
     #   ora2
     #   python3-openid
-    #   python3-saml
     #   social-auth-core
 deprecated==1.2.14
     # via jwcrypto
@@ -687,6 +686,7 @@ lxml==4.9.2
     #   olxcleaner
     #   openedx-calc
     #   ora2
+    #   python3-saml
     #   xblock
     #   xmlsec
 mailsnake==1.6.4
@@ -928,10 +928,8 @@ python3-openid==3.2.0 ; python_version >= "3"
     # via
     #   -r requirements/edx/kernel.in
     #   social-auth-core
-python3-saml==1.9.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/kernel.in
+python3-saml==1.15.0
+    # via -r requirements/edx/base.in
 pytz==2022.7.1
     # via
     #   -c requirements/edx/../constraints.txt
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 806eeaad31..add14c14aa 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -258,7 +258,6 @@ defusedxml==0.7.1
     #   djangorestframework-xml
     #   ora2
     #   python3-openid
-    #   python3-saml
     #   social-auth-core
 deprecated==1.2.14
     # via
@@ -928,6 +927,7 @@ lxml==4.9.2
     #   openedx-calc
     #   ora2
     #   pyquery
+    #   python3-saml
     #   xblock
     #   xmlsec
 mailsnake==1.6.4
@@ -1322,10 +1322,8 @@ python3-openid==3.2.0 ; python_version >= "3"
     # via
     #   -r requirements/edx/testing.txt
     #   social-auth-core
-python3-saml==1.9.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/testing.txt
+python3-saml==1.15.0
+    # via -r requirements/edx/testing.txt
 pytz==2022.7.1
     # via
     #   -c requirements/edx/../constraints.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index ea3990a359..d72610756e 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -241,7 +241,6 @@ defusedxml==0.7.1
     #   djangorestframework-xml
     #   ora2
     #   python3-openid
-    #   python3-saml
     #   social-auth-core
 deprecated==1.2.14
     # via
@@ -880,6 +879,7 @@ lxml==4.9.2
     #   openedx-calc
     #   ora2
     #   pyquery
+    #   python3-saml
     #   xblock
     #   xmlsec
 mailsnake==1.6.4
@@ -1240,10 +1240,8 @@ python3-openid==3.2.0 ; python_version >= "3"
     # via
     #   -r requirements/edx/base.txt
     #   social-auth-core
-python3-saml==1.9.0
-    # via
-    #   -c requirements/edx/../constraints.txt
-    #   -r requirements/edx/base.txt
+python3-saml==1.15.0
+    # via -r requirements/edx/base.txt
 pytz==2022.7.1
     # via
     #   -c requirements/edx/../constraints.txt