From d8ff61f6f69c123c66ca0fa13f99d2dc0fd89099 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 7 Apr 2015 11:40:34 -0400 Subject: [PATCH] Move github dependencies into github.txt --- requirements/edx/base.txt | 6 ------ requirements/edx/github.txt | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 43571d4079..a3b6cdaeac 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -39,10 +39,6 @@ elasticsearch==0.4.5 facebook-sdk==0.4.0 feedparser==5.1.3 firebase-token-generator==1.3.2 -# Master pyfs has a bug working with VPC auth. This is a fix. We should switch -# back to master when and if this fix is merged back. -# fs==0.4.0 -git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b GitPython==0.3.2.RC1 glob2==0.3 gunicorn==0.17.4 @@ -153,5 +149,3 @@ testtools==0.9.34 # Used for Segment.io analytics analytics-python==0.4.4 - -git+https://github.com/mfogel/django-settings-context-processor.git diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 4356c9f624..5802827083 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -21,6 +21,11 @@ -e git+https://github.com/pmitros/django-pyfs.git@d175715e0fe3367ec0f1ee429c242d603f6e8b10#egg=djpyfs git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a0c695#egg=django-cas -e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest +git+https://github.com/mfogel/django-settings-context-processor.git +# Master pyfs has a bug working with VPC auth. This is a fix. We should switch +# back to master when and if this fix is merged back. +# fs==0.4.0 +git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b # Our libraries: -e git+https://github.com/edx/XBlock.git@aed464a0e2f7478e93157150ac04133a745f5f46#egg=XBlock