Merge branch 'master' into nightly

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)
 

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

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:
+        except Exception as e:
-            fmt.echo_alert(f"Failed to enable plugin '{name}': {e.args[0]}")
+            fmt.echo_alert(f"Failed to enable plugin '{name}': {e}")
     hooks.Actions.PLUGINS_LOADED.do()
 
 

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