diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index 9a5f8be98a..8dca9f8a87 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -27,7 +27,7 @@ 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'] + PYTHON_REQ_FILES = ['requirements/edx/testing.txt', 'requirements/edx/django.txt'] else: PYTHON_REQ_FILES = ['requirements/edx/development.txt'] diff --git a/requirements/edx/django30.txt b/requirements/edx/django30.txt deleted file mode 100644 index fa01f5a928..0000000000 --- a/requirements/edx/django30.txt +++ /dev/null @@ -1,2 +0,0 @@ -Django>=3.0,<3.1 -django-cookies-samesite==0.9.0 diff --git a/requirements/edx/django31.txt b/requirements/edx/django31.txt deleted file mode 100644 index 36acb6babf..0000000000 --- a/requirements/edx/django31.txt +++ /dev/null @@ -1 +0,0 @@ -Django>=3.1,<3.2 diff --git a/requirements/edx/django32.txt b/requirements/edx/django32.txt deleted file mode 100644 index 675a1d1d42..0000000000 --- a/requirements/edx/django32.txt +++ /dev/null @@ -1,2 +0,0 @@ -Django>=3.2,<3.3 - diff --git a/scripts/xdist/prepare_xdist_nodes.sh b/scripts/xdist/prepare_xdist_nodes.sh index 1904e8cd24..c0bade9936 100644 --- a/scripts/xdist/prepare_xdist_nodes.sh +++ b/scripts/xdist/prepare_xdist_nodes.sh @@ -11,14 +11,8 @@ python scripts/xdist/pytest_worker_manager.py -a up -n ${XDIST_NUM_WORKERS} \ -iam ${XDIST_WORKER_IAM_PROFILE_ARN} # Install the correct version of Django depending on which tox environment (if any) is in use -if [[ -z ${TOXENV+x} ]] || [[ ${TOXENV} == 'null' ]]; then +if [[ -z ${TOXENV+x} ]] || [[ ${TOXENV} == 'null' ]] || [[ ${TOXENV} == *'django32'* ]]; then DJANGO_REQUIREMENT="requirements/edx/django.txt" -elif [[ ${TOXENV} == *'django30'* ]]; then - DJANGO_REQUIREMENT="requirements/edx/django30.txt" -elif [[ ${TOXENV} == *'django31'* ]]; then - DJANGO_REQUIREMENT="requirements/edx/django31.txt" -elif [[ ${TOXENV} == *'django32'* ]]; then - DJANGO_REQUIREMENT="requirements/edx/django32.txt" fi ip_list=$(