diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index 4b670397d8..9a5f8be98a 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -23,8 +23,11 @@ COVERAGE_REQ_FILE = 'requirements/edx/coverage.txt' # 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 -if 'TOXENV' in os.environ: +toxenv = os.environ.get('TOXENV') +if toxenv and toxenv != 'quality-django32': PYTHON_REQ_FILES = ['requirements/edx/testing.txt'] +elif toxenv and toxenv == 'quality-django32': + PYTHON_REQ_FILES = ['requirements/edx/testing.txt', 'requirements/edx/django32.txt'] else: PYTHON_REQ_FILES = ['requirements/edx/development.txt'] diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh index 1dabf274f3..a879a359bf 100755 --- a/scripts/generic-ci-tests.sh +++ b/scripts/generic-ci-tests.sh @@ -68,9 +68,14 @@ END # if specified tox environment is supported, prepend paver commands # with tox env invocation if [ -z ${TOX_ENV+x} ] || [[ ${TOX_ENV} == 'null' ]]; then + echo "TOX_ENV: ${TOX_ENV}" TOX="" elif tox -l |grep -q "${TOX_ENV}"; then - TOX="tox -r -e ${TOX_ENV} --" + if [[ "${TOX_ENV}" == 'quality-django32' ]]; then + TOX="" + else + TOX="tox -r -e ${TOX_ENV} --" + fi else echo "${TOX_ENV} is not currently supported. Please review the" echo "tox.ini file to see which environments are supported" diff --git a/tox.ini b/tox.ini index e5b7421ec0..52519201be 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{22,30,31,32} +envlist = py38-django{22,30,31,32}, quality-django{32} # This is needed to prevent the lms, cms, and openedx packages inside the "Open # edX" package (defined in setup.py) from getting installed into site-packages