From 6c778d469efa6549b5f2135d2b6b06c4020b5a80 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Fri, 3 Mar 2023 11:57:00 -0500
Subject: [PATCH 1/2] Revert "fix python requirement versions (#1159)"

This reverts commit 2ad2352fbba0962f33017339965e93c86e3b84b3. The
changes made to the requirements list in that commit were not valid and
actively prevent users from installing the qiskit-ibmq-provider with any
version of qiskit-terra other than the 0.23.x release series. Similarly
the caps set on every dependency are overly restrictive and will cause
compatibility issues with other packages, especially if there are shared
dependencies between multiple packages. This commit reverts these
changes to prevent issues and this needs to be released as part as
0.20.2 to unblock a future qiskit metapackage release.
---
 requirements.txt | 18 +++++++++---------
 setup.py         | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index d3f9a116a..86cc4eb76 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
-qiskit-terra~=0.23.0
-requests~=2.28.0
-requests_ntlm~=1.1.0
+qiskit-terra>=0.18.0
+requests>=2.19
+requests_ntlm>=1.1.0
 numpy<1.24
-urllib3~=1.26.0
-python-dateutil~=2.8.0
-websocket-client~=1.5.1
-websockets~=10.0; python_version >= '3.7'
-websockets~=9.1; python_version < '3.7'
-dataclasses~=0.8; python_version < '3.7'
+urllib3>=1.21.1
+python-dateutil>=2.8.0
+websocket-client<=1.3.3
+websockets>=10.0; python_version >= '3.7'
+websockets>=9.1; python_version < '3.7'
+dataclasses>=0.8; python_version < '3.7'
diff --git a/setup.py b/setup.py
index 9ed3c5b42..5d23ab47d 100644
--- a/setup.py
+++ b/setup.py
@@ -19,16 +19,16 @@
 from setuptools import setup
 
 REQUIREMENTS = [
-    "qiskit-terra~=0.23.0",
-    "requests~=2.28.0",
-    "requests-ntlm~=1.1.0",
+    "qiskit-terra>=0.18.0",
+    "requests>=2.19",
+    "requests-ntlm>=1.1.0",
     "numpy<1.24",
-    "urllib3~=1.26.0",
-    "python-dateutil~=2.8.0",
-    "websocket-client~=1.5.1",
-    "websockets~=10.0 ; python_version>='3.7'",
-    "websockets~=9.1 ; python_version<'3.7'",
-    "dataclasses~=0.8 ; python_version<'3.7'"
+    "urllib3>=1.21.1",
+    "python-dateutil>=2.8.0",
+    "websocket-client<=1.3.3",
+    "websockets>=10.0 ; python_version>='3.7'",
+    "websockets>=9.1 ; python_version<'3.7'",
+    "dataclasses>=0.8 ; python_version<'3.7'"
 ]
 
 # Handle version.

From 2b9cfb14e785bbbc695daa3c41c5b658b16aa10a Mon Sep 17 00:00:00 2001
From: kevin-tian <kevin.tian@ibm.com>
Date: Mon, 6 Mar 2023 17:07:37 -0500
Subject: [PATCH 2/2] pin ntlm package

---
 requirements.txt | 4 ++--
 setup.py         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 86cc4eb76..0bb030a6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
 qiskit-terra>=0.18.0
 requests>=2.19
-requests_ntlm>=1.1.0
+requests_ntlm<=1.1.0
 numpy<1.24
 urllib3>=1.21.1
 python-dateutil>=2.8.0
-websocket-client<=1.3.3
+websocket-client>=1.5.1
 websockets>=10.0; python_version >= '3.7'
 websockets>=9.1; python_version < '3.7'
 dataclasses>=0.8; python_version < '3.7'
diff --git a/setup.py b/setup.py
index 5d23ab47d..29a74f6d5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,11 +21,11 @@
 REQUIREMENTS = [
     "qiskit-terra>=0.18.0",
     "requests>=2.19",
-    "requests-ntlm>=1.1.0",
+    "requests-ntlm<=1.1.0",
     "numpy<1.24",
     "urllib3>=1.21.1",
     "python-dateutil>=2.8.0",
-    "websocket-client<=1.3.3",
+    "websocket-client>=1.5.1",
     "websockets>=10.0 ; python_version>='3.7'",
     "websockets>=9.1 ; python_version<'3.7'",
     "dataclasses>=0.8 ; python_version<'3.7'"