perf: add redwood compatibility

README.md

@@ -64,12 +64,13 @@ Please see the following table for details on compatibility.
 | olive   | v15   |
 | palm    | v16   |
 | quince  | v17   |
+| redwood | v18   |
 
 Then, specify the docker image variables to identify your custom images, like the example:
 
 ```yaml
-DOCKER_IMAGE_OPENEDX: 'docker.io/ednxops/distro-edunext-edxapp:quince'
-DOCKER_IMAGE_OPENEDX_DEV: 'docker.io/ednxops/distro-edunext-edxapp-dev:quince'
+DOCKER_IMAGE_OPENEDX: "docker.io/ednxops/distro-edunext-edxapp:redwood"
+DOCKER_IMAGE_OPENEDX_DEV: "docker.io/ednxops/distro-edunext-edxapp-dev:redwood"
 ```
 
 Finally, launch your instance or build a new image to reflect the changes.

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 17.2.0
+current_version = 18.0.0
 commit = False
 tag = False
 

setup.py

@@ -39,7 +39,7 @@ def load_about():
     packages=find_packages(),
     include_package_data=True,
     python_requires=">=3.8",
-    install_requires=["tutor>=17.0.3, <18", "click", "schema"],
+    install_requires=["tutor>=18.0.0, <19", "click", "schema"],
     extras_require={
             "test": ["behave", "pytest", "pylint", "pytest-mock", "pycodestyle", "isort", "schema"]
         },

tutordistro/__about__.py

@@ -2,4 +2,4 @@
 Tutor Distro version.
 """
 
-__version__ = "17.2.0"
+__version__ = "18.0.0"

tutordistro/distro/extra_commands/infrastructure/tutor_commands.py

@@ -69,17 +69,24 @@ def run_command(self, command: str):
             command (str): Tutor command.
         """
         try:
-            process = subprocess.run(
+            print(f'Running "{command}"')
+
+            with subprocess.Popen(
                 command,
                 shell=True,
-                check=True,
-                capture_output=True,
                 executable="/bin/bash",
-            )
-            # This print is left on purpose to show the command output
-            print(process.stdout.decode())
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            ) as process:
+
+                stdout, stderr = process.communicate(input="y")
+
+                if process.returncode != 0 or "error" in stderr.lower():
+                    raise subprocess.CalledProcessError(
+                        process.returncode, command, output=stdout, stderr=stderr
+                    )
 
         except subprocess.CalledProcessError as error:
-            raise CommandError(
-                f"Error running command '{error.cmd}':\n{error.stderr.decode()}"
-            ) from error
+            raise CommandError(f"\n{error.stderr}") from error

tutordistro/patches/openedx-dockerfile-pre-assets

@@ -1,16 +1,15 @@
 ENV NO_PYTHON_UNINSTALL 1
 ENV NO_PREREQ_INSTALL 1
-RUN openedx-assets xmodule \
-    && openedx-assets npm \
-    && openedx-assets webpack --env=prod \
-    && openedx-assets common
+RUN npm run postinstall \
+    && npm run webpack \
+    && npm run compile-sass -- --skip-themes
 {% if DISTRO_THEMES_ROOT is defined %}
 COPY --chown=app:app ./themes/ {{ DISTRO_THEMES_ROOT }}
 {% endif %}
 {% if DISTRO_THEME_DIRS is defined and DISTRO_THEMES_NAME is defined %}
-RUN openedx-assets themes \
-    --theme-dirs {{ DISTRO_THEME_DIRS | join(' ') }} \
-    --themes {{ DISTRO_THEMES_NAME | join(' ') }} \
-    && openedx-assets collect --settings=tutor.assets \
+RUN npm run compile-sass -- \
+    --theme-dir {{ DISTRO_THEME_DIRS | join(' --theme-dir ') }} \
+    --theme {{ DISTRO_THEMES_NAME | join(' --theme ') }} \
+    && ./manage.py lms collectstatic --noinput --settings=tutor.assets \
     && rdfind -makesymlinks true -followsymlinks true /openedx/staticfiles/
 {% endif %}