Merge pull request #4284 from edx/nadeem/OPS-1008

Move XBlock requirements into configuration

playbooks/roles/edxapp/defaults/main.yml

@@ -452,6 +452,43 @@ EDXAPP_INSTALL_PRIVATE_REQUIREMENTS: false
 #   - name: git+https://git.myproject.org/MyProject#egg=MyProject
 EDXAPP_EXTRA_REQUIREMENTS: []
 
+# List of private requirements that should be installed into the
+# edxapp virtual environment.
+# `name` (required), 'extra_args' (optional)
+# Example:
+# EDXAPP_PRIVATE_REQUIREMENTS:
+#   - name: git+https://git.myproject.org/MyProject#egg=MyProject
+EDXAPP_PRIVATE_REQUIREMENTS: 
+    # For Harvard courses:
+    - name: git+https://github.com/open-craft/problem-builder.git@v2.7.7#egg=xblock-problem-builder==2.7.7
+    # Oppia XBlock
+    - name: git+https://github.com/oppia/xblock.git@9f6b95b7eb7dbabb96b77198a3202604f96adf65#egg=oppia-xblock
+      extra_args: -e
+    # Microsoft's Office Mix XBlock
+    - name: git+https://github.com/OfficeDev/xblock-officemix.git@3f876b5f0267b017812620239533a29c7d562d24#egg=officemix
+      extra_args: -e
+    # This repository contains schoolyourself-xblock, which is used in
+    # edX's "AlgebraX" and "GeometryX" courses.
+    - name: git+https://github.com/schoolyourself/schoolyourself-xblock.git@5e4d37716e3e72640e832e961f7cc0d38d4ec47b#egg=schoolyourself-xblock
+      extra_args: -e
+    # Prototype XBlocks from edX learning sciences limited roll-outs and user testing.
+    # Concept XBlock, in particular, is nowhere near finished and an early prototype.
+    # Profile XBlock is there so we can play with XBlock arguments in the platform, but isn't ready for use outside of
+    # edX.
+    - name: git+https://github.com/edx/ConceptXBlock.git@2376fde9ebdd83684b78dde77ef96361c3bd1aa0#egg=concept-xblock
+      extra_args: -e
+    - name: git+https://github.com/edx/AudioXBlock.git@1fbf19cc21613aead62799469e1593adb037fdd9#egg=audio-xblock
+      extra_args: -e
+    - name: git+https://github.com/edx/AnimationXBlock.git@d2b551bb8f49a138088e10298576102164145b87#egg=animation-xblock
+      extra_args: -e
+    # Peer instruction XBlock
+    - name: ubcpi-xblock==0.6.4
+    # Vector Drawing and ActiveTable XBlocks (Davidson)
+    - name: git+https://github.com/open-craft/xblock-vectordraw.git@c57df9d98119fd2ca4cb31b9d16c27333cdc65ca#egg=xblock-vectordraw==0.2.1
+      extra_args: -e
+    - name: git+https://github.com/open-craft/xblock-activetable.git@e933d41bb86a8d50fb878787ca680165a092a6d5#egg=xblock-activetable
+      extra_args: -e
+
 # List of custom middlewares that should be used in edxapp to process
 # incoming HTTP resquests. Should be a list of plain strings that fully
 # qualify Python classes or functions that can be used as Django middleware.
@@ -1357,7 +1394,6 @@ base_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/base.txt"
 django_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/django.txt"
 post_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/post.txt"
 paver_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/paver.txt"
-private_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/edx-private.txt"
 
 sandbox_base_requirements:  "{{ edxapp_code_dir }}/requirements/edx-sandbox/base.txt"
 sandbox_local_requirements: "{{ edxapp_code_dir }}/requirements/edx-sandbox/local.txt"
@@ -1388,7 +1424,6 @@ edxapp_requirements_with_github_urls:
   - "{{ base_requirements_file }}"
   - "{{ post_requirements_file }}"
   - "{{ paver_requirements_file }}"
-  - "{{ private_requirements_file }}"
   - "{{ sandbox_post_requirements }}"
   - "{{ sandbox_local_requirements }}"
   - "{{ sandbox_base_requirements }}"

playbooks/roles/edxapp/tasks/deploy.yml

@@ -160,11 +160,11 @@
   # Need to use shell rather than pip so that we can maintain the context of our current working directory; some
   # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
   # installs everything into that virtual environment.
-  shell: "{{ edxapp_venv_dir }}/bin/pip install {{ COMMON_PIP_VERBOSITY }} -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w -r {{ item }}"
+  shell: "{{ edxapp_venv_dir }}/bin/pip install {{ COMMON_PIP_VERBOSITY }} -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w {{ item.extra_args|default('') }} {{ item.name }}"
   args:
     chdir: "{{ edxapp_code_dir }}"
   with_items:
-  - "{{ private_requirements_file }}"
+  - "{{ EDXAPP_PRIVATE_REQUIREMENTS }}"
   become_user: "{{ edxapp_user }}"
   environment:
     GIT_SSH: "{{ edxapp_git_ssh }}"