diff --git a/CHANGELOG.md b/CHANGELOG.md index c4ffaf1..e6c85f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ Every user-facing change should have an entry in this changelog. Please respect ## Unreleased +- [Fix] Ignore Python plugins that cannot be loaded. (by @regisb) +- [Improvement] Faster and more reliable builds with `npm clean-install` instead of `npm install`. (by @regisb. Thanks @ghassanmas!) - [Fix] Fix 500 error during studio login. (by @regisb) - [Fix] Fix updates for the Caddy deployment in multi-node Kubernetes clusters (#660). Previously, Caddy configuration updates might fail if the Kubernetes cluster had more than one worker node. (by @fghaas) diff --git a/docs/dev.rst b/docs/dev.rst index 33162a0..e599933 100644 --- a/docs/dev.rst +++ b/docs/dev.rst @@ -233,7 +233,7 @@ Then, you should run the following commands:: pip install --requirement requirements/edx/development.txt # Install nodejs packages in node_modules/ - npm install + npm clean-install # Rebuild static assets openedx-assets build --env=dev diff --git a/tutor/plugins/__init__.py b/tutor/plugins/__init__.py index cf662e0..40ba0a3 100644 --- a/tutor/plugins/__init__.py +++ b/tutor/plugins/__init__.py @@ -72,8 +72,8 @@ def load_all(names: t.Iterable[str]) -> None: for name in names: try: load(name) - except exceptions.TutorError as e: - fmt.echo_alert(f"Failed to enable plugin '{name}': {e.args[0]}") + except Exception as e: + fmt.echo_alert(f"Failed to enable plugin '{name}': {e}") hooks.Actions.PLUGINS_LOADED.do() diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 67207a2..4c3b06b 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -109,8 +109,9 @@ RUN nodeenv /openedx/nodeenv --node=12.13.0 --prebuilt # Install nodejs requirements ARG NPM_REGISTRY={{ NPM_REGISTRY }} COPY --from=code /openedx/edx-platform/package.json /openedx/edx-platform/package.json +COPY --from=code /openedx/edx-platform/package-lock.json /openedx/edx-platform/package-lock.json WORKDIR /openedx/edx-platform -RUN npm install --verbose --registry=$NPM_REGISTRY +RUN npm clean-install --verbose --registry=$NPM_REGISTRY ###### Production image with system and python requirements FROM minimal as production