From 9b01f29ac53e965fb7ac942f44d00a3590bb190b Mon Sep 17 00:00:00 2001
From: Ahmad Bilal Khalid <ahmedbilal96@gmail.com>
Date: Mon, 20 Jul 2020 11:39:48 +0500
Subject: [PATCH] Remove edx-ora2 from requirements/constraints.txt and run
 make upgrade

---
 requirements/constraints.txt     | 4 ----
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/testing.txt     | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 976fbaa15fa..72cf7fd2cec 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -118,7 +118,3 @@ numpy<1.19
 
 # scipy 1.5 equires Python 3.6
 scipy<1.5
-
-
-# latest ora causing failures
-ora2==2.8.6
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 03a9b76cc70..36c6ba73f9a 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -165,7 +165,7 @@ nodeenv==1.4.0            # via -r requirements/edx/base.in
 numpy==1.18.5             # via -c requirements/edx/../constraints.txt, chem, openedx-calc, scipy
 oauthlib==3.0.1           # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core
 openedx-calc==1.0.9       # via -r requirements/edx/base.in
-ora2==2.8.6               # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
+ora2==2.8.8               # via -r requirements/edx/base.in
 packaging==20.4           # via bleach, drf-yasg
 path.py==12.4.0           # via edx-enterprise, edx-i18n-tools, ora2, xmodule
 path==13.1.0              # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, path.py
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 22b26f75832..9287dd92c21 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -200,7 +200,7 @@ nodeenv==1.4.0            # via -r requirements/edx/testing.txt
 numpy==1.18.5             # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, chem, openedx-calc, scipy
 oauthlib==3.0.1           # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core
 openedx-calc==1.0.9       # via -r requirements/edx/testing.txt
-ora2==2.8.6               # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
+ora2==2.8.8               # via -r requirements/edx/testing.txt
 packaging==20.4           # via -r requirements/edx/testing.txt, bleach, drf-yasg, pytest, sphinx, tox
 path.py==12.4.0           # via -r requirements/edx/testing.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule
 path==13.1.0              # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, path.py
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index ce954f40c0b..5ec83c13968 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -192,7 +192,7 @@ nodeenv==1.4.0            # via -r requirements/edx/base.txt
 numpy==1.18.5             # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, chem, openedx-calc, scipy
 oauthlib==3.0.1           # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core
 openedx-calc==1.0.9       # via -r requirements/edx/base.txt
-ora2==2.8.6               # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
+ora2==2.8.8               # via -r requirements/edx/base.txt
 packaging==20.4           # via -r requirements/edx/base.txt, bleach, drf-yasg, pytest, tox
 path.py==12.4.0           # via -r requirements/edx/base.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule
 path==13.1.0              # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, path.py
-- 
GitLab