From f984c277e4907aa7d9d5a61bf8187aa6512b848c Mon Sep 17 00:00:00 2001
From: stv <stv@stanford.edu>
Date: Thu, 2 May 2019 15:24:08 -0700
Subject: [PATCH] Install calc from new edx repo

---
 requirements/edx-sandbox/base.in  | 2 +-
 requirements/edx-sandbox/base.txt | 2 +-
 requirements/edx/base.txt         | 2 +-
 requirements/edx/development.txt  | 2 +-
 requirements/edx/github.in        | 1 +
 requirements/edx/local.in         | 1 -
 requirements/edx/testing.txt      | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements/edx-sandbox/base.in b/requirements/edx-sandbox/base.in
index fbc37804482..d17c1cda29f 100644
--- a/requirements/edx-sandbox/base.in
+++ b/requirements/edx-sandbox/base.in
@@ -15,11 +15,11 @@ numpy==1.6.2                        # Numeric array processing utilities; used b
 pyparsing==2.2.0                    # Python Parsing module
 scipy==0.14.0                       # Math, science, and engineering library
 sympy==0.7.1                        # Symbolic math library
+git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 
 # Install these packages from the edx-platform working tree
 # NOTE: if you change code in these packages, you MUST change the version
 # number in its setup.py or the code WILL NOT be installed during deploy.
--e common/lib/calc
 -e common/lib/chem
 -e common/lib/sandbox-packages
 -e common/lib/symmath
diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
index 334b8d54431..3475afcd050 100644
--- a/requirements/edx-sandbox/base.txt
+++ b/requirements/edx-sandbox/base.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-common/lib/calc
+git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 common/lib/chem
 common/lib/sandbox-packages
 common/lib/symmath
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 52ddee03dc1..888047d31ba 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -5,7 +5,7 @@
 #    make upgrade
 #
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
--e common/lib/calc
+git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 -e common/lib/capa
 -e common/lib/chem
 -e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index df62fd39024..468e43381c8 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -5,7 +5,7 @@
 #    make upgrade
 #
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
--e common/lib/calc
+git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 -e common/lib/capa
 -e common/lib/chem
 -e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail
diff --git a/requirements/edx/github.in b/requirements/edx/github.in
index 0441c024504..7edc79bea8d 100644
--- a/requirements/edx/github.in
+++ b/requirements/edx/github.in
@@ -59,6 +59,7 @@
 
 
 # Python libraries to install directly from github
+git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 
 # Third-party:
 -e git+https://github.com/edx/django-wiki.git@v0.0.21#egg=django-wiki
diff --git a/requirements/edx/local.in b/requirements/edx/local.in
index de95aae2fce..e3763a0f1e2 100644
--- a/requirements/edx/local.in
+++ b/requirements/edx/local.in
@@ -1,6 +1,5 @@
 # Python libraries to install that are local to the edx-platform repo
 -e .
--e common/lib/calc
 -e common/lib/capa
 -e common/lib/chem
 -e common/lib/safe_lxml
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index f29138b8cab..329f76fb2d8 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -5,7 +5,7 @@
 #    make upgrade
 #
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
--e common/lib/calc
+git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
 -e common/lib/capa
 -e common/lib/chem
 -e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail
-- 
GitLab