build: Removing un-used django versions from tox and other places. (#30270)

This commit is contained in:
Awais Qureshi
2022-04-19 16:41:29 +05:00
committed by GitHub
parent b944605eb0
commit b97af6ac6e
6 changed files with 4 additions and 18 deletions

View File

@@ -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']

View File

@@ -1,2 +0,0 @@
Django>=3.0,<3.1
django-cookies-samesite==0.9.0

View File

@@ -1 +0,0 @@
Django>=3.1,<3.2

View File

@@ -1,2 +0,0 @@
Django>=3.2,<3.3

View File

@@ -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=$(<pytest_worker_ips.txt)

View File

@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{22,30,31,32}, quality-django{32}
envlist = py38-django{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
@@ -67,10 +67,7 @@ passenv =
XDIST_WORKER_SECURITY_GROUP
XDIST_WORKER_SUBNET
deps =
django22: -r requirements/edx/django.txt
django30: -r requirements/edx/django30.txt
django31: -r requirements/edx/django31.txt
django32: -r requirements/edx/django32.txt
django32: -r requirements/edx/django.txt
-r requirements/edx/testing.txt
whitelist_externals =
/bin/bash