Merge pull request openedx#435

* stv/diff/requirements:
  Split Stanford requirements to separate file

requirements/edx/base.txt

@@ -156,9 +156,6 @@ analytics-python==0.4.4
 
 git+https://github.com/mfogel/django-settings-context-processor.git
 
-# XBlocks from PyPi
-xblock-image-modal >=0.2.0, <1.0.0
-
 # Needed for mailchimp(mailing djangoapp)
 mailsnake==1.6.2
 jsonfield==1.0.3

requirements/edx/github.txt

@@ -39,20 +39,9 @@ git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx
 -e git+https://github.com/edx/js-test-tool.git@v0.1.6#egg=js_test_tool
 -e git+https://github.com/edx/event-tracking.git@0.2.0#egg=event-tracking
 -e git+https://github.com/edx-solutions/django-splash.git@7579d052afcf474ece1239153cffe1c89935bc4f#egg=django-splash
-
+-e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
 -e git+https://github.com/Stanford-Online/edx-ora2.git@76ea060fbe5694f21443ee5dde2b669c1b6efadc#egg=edx-ora2
-
-# Forking Submissions repo for ORA2 score override function.
 -e git+https://github.com/Stanford-Online/edx-submissions.git@1e8d8ea9a15d0f15ea28d1d348c79cfa66016608#egg=edx-submissions
--e git+https://github.com/Stanford-Online/edx-analytics-data-api-client.git@1b8260ce8dd6edb999fffc46b09f77c83f87e1f9#egg=edx-analytics-data-api-client
-
-# This portion of requirements.txt is now maintained only for the Stanford fork, i.e. we should update as necessary
-# Third Party XBlocks
--e git+https://github.com/edx-solutions/xblock-ooyala.git@32d52edaa820dbdbf846d8a84f6bccbf0b9c8218#egg=xblock_ooyala_player-master
--e git+https://github.com/Stanford-Online/DoneXBlock.git@0a38297377c262313b4677ec44deb9fac4db5afb#egg=done-xblock
--e git+https://github.com/Stanford-Online/xblock-submit-and-compare.git@2d5d0f7156ab35abe4bb3a51927cc447511b8d98#egg=xblock-submit-and-compare
--e git+https://github.com/Stanford-Online/xblock-mufi.git@ee853b8a7668a87c27d13d55c0d149a04b8657b8#egg=xblock_mufi-master
--e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
 -e git+https://github.com/edx/opaque-keys.git@27dc382ea587483b1e3889a3d19cbd90b9023a06#egg=opaque-keys
 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
 git+https://github.com/edx/i18n-tools.git@v0.1.2#egg=i18n-tools==v0.1.2
@@ -72,13 +61,7 @@ git+https://github.com/edx/ecommerce-api-client.git@1.1.0#egg=ecommerce-api-clie
 git+https://github.com/edx/edx-proctoring.git@0.6.2#egg=edx-proctoring==0.6.2
 
 # Third Party XBlocks
--e git+https://github.com/Stanford-Online/xblock-grademe.git@v0.1.0#egg=grademebutton
 -e git+https://github.com/Stanford-Online/edx-sga@0fb3a0e8887c6856f13c1c388661dcc255710b1d#egg=edx-sga
 -e git+https://github.com/open-craft/xblock-poll@v1.0#egg=xblock-poll
 
-# OLI XBlocks
--e git+https://github.com/openlearninginitiative/xblock-image-coding.git@cee23e3d59943066159ca13839c82a12d9ccf749#egg=xblock_image_coding
-
-# Stanford XBlocks
--e git+https://github.com/Stanford-Online/xblock-qualtrics-survey@653400485196f8bb05b859c9d89de378a22e0503#egg=xblock-qualtrics-survey
--e git+https://github.com/Stanford-Online/xblock-free-text-response@46e082437246a058dc80c10570316f3a3a3bcc2b#egg=xblock-free-text-response
+-r stanford.txt

requirements/edx/stanford.txt

@@ -0,0 +1,10 @@
+xblock-image-modal >=0.2.0, <1.0.0
+-e git+https://github.com/openlearninginitiative/xblock-image-coding.git@cee23e3d59943066159ca13839c82a12d9ccf749#egg=xblock_image_coding
+-e git+https://github.com/Stanford-Online/xblock-qualtrics-survey@653400485196f8bb05b859c9d89de378a22e0503#egg=xblock-qualtrics-survey
+-e git+https://github.com/Stanford-Online/xblock-free-text-response@46e082437246a058dc80c10570316f3a3a3bcc2b#egg=xblock-free-text-response
+-e git+https://github.com/Stanford-Online/xblock-grademe.git@v0.1.0#egg=grademebutton
+-e git+https://github.com/edx-solutions/xblock-ooyala.git@32d52edaa820dbdbf846d8a84f6bccbf0b9c8218#egg=xblock_ooyala_player-master
+-e git+https://github.com/Stanford-Online/DoneXBlock.git@0a38297377c262313b4677ec44deb9fac4db5afb#egg=done-xblock
+-e git+https://github.com/Stanford-Online/xblock-submit-and-compare.git@2d5d0f7156ab35abe4bb3a51927cc447511b8d98#egg=xblock-submit-and-compare
+-e git+https://github.com/Stanford-Online/xblock-mufi.git@ee853b8a7668a87c27d13d55c0d149a04b8657b8#egg=xblock_mufi-master
+-e git+https://github.com/Stanford-Online/edx-analytics-data-api-client.git@1b8260ce8dd6edb999fffc46b09f77c83f87e1f9#egg=edx-analytics-data-api-client