From 17238132b76c753d30be98375d706178a1ea1dba Mon Sep 17 00:00:00 2001 From: Michael Youngstrom <myoungstrom@edx.org> Date: Fri, 29 Jun 2018 12:06:04 -0400 Subject: [PATCH] Remove NPM install for unittest runs --- pavelib/prereqs.py | 3 ++- scripts/unit-tests.sh | 1 + tox.ini | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index 11b85a194a9..50a7ca1a8d0 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -305,7 +305,8 @@ def install_prereqs(): print NO_PREREQ_MESSAGE return - install_node_prereqs() + if not str2bool(os.environ.get('SKIP_NPM_INSTALL', 'False')): + install_node_prereqs() install_python_prereqs() log_installed_python_prereqs() diff --git a/scripts/unit-tests.sh b/scripts/unit-tests.sh index d9f4cbfe743..837dd8e73e7 100755 --- a/scripts/unit-tests.sh +++ b/scripts/unit-tests.sh @@ -31,6 +31,7 @@ set -e PAVER_ARGS="-v" PARALLEL="--processes=-1" +export SKIP_NPM_INSTALL="True" # Skip re-installation of Python prerequisites inside a tox execution. if [[ -n "$TOXENV" ]]; then diff --git a/tox.ini b/tox.ini index 63b3f8592b0..a53421bd630 100644 --- a/tox.ini +++ b/tox.ini @@ -42,6 +42,7 @@ passenv = SELENIUM_HOST SELENIUM_PORT SHARD + SKIP_NPM_INSTALL TEST_SUITE deps = django18: Django>=1.8,<1.9 -- GitLab