From df65fd6cf576f33bf5d632ae2e2f9bfdd8116c69 Mon Sep 17 00:00:00 2001
From: Jillian Vogel <jill@opencraft.com>
Date: Tue, 19 Mar 2024 10:11:27 +1030
Subject: [PATCH 1/2] refactor: moves the openedx pip requirements into a patch

instead of using the OPENEDX_EXTRA_PIP_REQUIREMENTS variable. This
allows Tutor operators to use this variable to add their own extra
requirements.
---
 .../patches/openedx-dockerfile-post-python-requirements    | 2 ++
 tutoraspects/plugin.py                                     | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)
 create mode 100644 tutoraspects/patches/openedx-dockerfile-post-python-requirements

diff --git a/tutoraspects/patches/openedx-dockerfile-post-python-requirements b/tutoraspects/patches/openedx-dockerfile-post-python-requirements
new file mode 100644
index 000000000..163d62051
--- /dev/null
+++ b/tutoraspects/patches/openedx-dockerfile-post-python-requirements
@@ -0,0 +1,2 @@
+RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
+    pip install "platform-plugin-aspects==0.3.1" "edx-event-routing-backends==v8.1.1"
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
index ac698de45..18414f573 100644
--- a/tutoraspects/plugin.py
+++ b/tutoraspects/plugin.py
@@ -38,13 +38,6 @@
         ("DOCKER_IMAGE_RALPH", "fundocker/ralph:4.1.0"),
         ("DOCKER_IMAGE_SUPERSET", "edunext/aspects-superset:{{ ASPECTS_VERSION }}"),
         ("DOCKER_IMAGE_VECTOR", "timberio/vector:0.30.0-alpine"),
-        (
-            "OPENEDX_EXTRA_PIP_REQUIREMENTS",
-            [
-                "platform-plugin-aspects==0.3.1",
-                "edx-event-routing-backends==v8.1.1",
-            ],
-        ),
         (
             "EVENT_SINK_MODELS_ENABLED",
             ["course_overviews"],

From e84ff531046ba3b13f6043e0c2412b01fca671a0 Mon Sep 17 00:00:00 2001
From: Jillian Vogel <jill@opencraft.com>
Date: Wed, 20 Mar 2024 09:26:29 +1030
Subject: [PATCH 2/2] refactor: split requirements into separate lines

---
 .../patches/openedx-dockerfile-post-python-requirements       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tutoraspects/patches/openedx-dockerfile-post-python-requirements b/tutoraspects/patches/openedx-dockerfile-post-python-requirements
index 163d62051..082034bf2 100644
--- a/tutoraspects/patches/openedx-dockerfile-post-python-requirements
+++ b/tutoraspects/patches/openedx-dockerfile-post-python-requirements
@@ -1,2 +1,4 @@
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
-    pip install "platform-plugin-aspects==0.3.1" "edx-event-routing-backends==v8.1.1"
+    pip install "platform-plugin-aspects==0.3.1"
+RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
+    pip install "edx-event-routing-backends==v8.1.1"