Skip to content

Commit ae62d9c

Browse files
committed
refactor: retire EDXAPP_EXTRA_REQUIREMENTS
Implements: - edx/edx-arch-experiments#1000
1 parent 7e423aa commit ae62d9c

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

playbooks/roles/edxapp/defaults/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -522,10 +522,8 @@ EDXAPP_UPDATE_STATIC_FILES_KEY: false
522522

523523
EDXAPP_INSTALL_PRIVATE_REQUIREMENTS: false
524524

525-
# Do NOT use EDXAPP_EXTRA_REQUIREMENTS.
526-
# This setting has been deprecated. Use EDXAPP_PRIVATE_REQUIREMENTS instead.
527-
# See argocd/applications/edxapp-lms/docs/decisions/0001-consolidate-edxapp-private-requirements.rst
528-
EDXAPP_EXTRA_REQUIREMENTS: []
525+
# EDXAPP_EXTRA_REQUIREMENTS has been deprecated and removed. All dependencies
526+
# have been moved to EDXAPP_PRIVATE_REQUIREMENTS.
529527

530528
# These defaults for EDXAPP_PRIVATE_REQUIREMENTS are used for Edge and
531529
# sandboxes in EC2. Post containerization, there will be a single

playbooks/roles/edxapp/tasks/deploy.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
tags:
167167
- install
168168
- install:app-requirements
169-
169+
170170
- name: Install local edxapp requirements
171171
command: "{{ edxapp_venv_dir }}/bin/pip install -e {{ edxapp_code_dir }}/."
172172
become_user: "{{ edxapp_user }}"
@@ -197,24 +197,6 @@
197197
- install
198198
- install:app-requirements
199199

200-
# Install any custom extra requirements if defined in EDXAPP_EXTRA_REQUIREMENTS.
201-
- name: install python extra requirements
202-
pip:
203-
name: "{{ item.name }}"
204-
version: "{{ item.version|default(omit) }}"
205-
extra_args: "--exists-action w {{ item.extra_args|default('') }}"
206-
virtualenv: "{{ edxapp_venv_dir }}"
207-
state: present
208-
with_items: "{{ EDXAPP_EXTRA_REQUIREMENTS }}"
209-
become_user: "{{ edxapp_user }}"
210-
register: edxapp_install_extra_python_reqs
211-
until: edxapp_install_extra_python_reqs is succeeded
212-
retries: 5
213-
delay: 15
214-
tags:
215-
- install
216-
- install:app-requirements
217-
218200
- name: "Install Datadog APM requirements"
219201
when: EDXAPP_DATADOG_ENABLE
220202
pip:

0 commit comments

Comments
 (0)