diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index 220a5387c4..648316892c 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -11,6 +11,10 @@ from .utils.envs import Env PREREQS_MD5_DIR = os.getenv('PREREQ_CACHE_DIR', Env.REPO_ROOT / '.prereqs_cache') NPM_REGISTRY = "http://registry.npmjs.org/" + +# If you make any changes to this list you also need to make +# a corresponding change to circle.yml, which is how the python +# prerequisites are installed for builds on circleci.com PYTHON_REQ_FILES = [ 'requirements/edx/pre.txt', 'requirements/edx/github.txt', diff --git a/scripts/circle-ci-tests.sh b/scripts/circle-ci-tests.sh index e179a1c9da..8840c1485f 100755 --- a/scripts/circle-ci-tests.sh +++ b/scripts/circle-ci-tests.sh @@ -25,6 +25,10 @@ set -e # piped command, or a zero if they all succeed. set -o pipefail +# There is no need to install the prereqs, as this was already +# just done via the dependencies override section of circle.yml. +export NO_PREREQ_INSTALL='true' + EXIT=0 case $CIRCLE_NODE_INDEX in