diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32ca4d49..f30f5821 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.8'] - toxenv: [django32, django42, quality, pii_check] + toxenv: [django42, quality, pii_check] steps: - uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index 6b17a108..6a68e8e2 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,10 @@ migrate: ## apply database migrations html_coverage: ## generate and view HTML coverage report coverage html && open htmlcov/index.html +define COMMON_CONSTRAINTS_TEMP_COMMENT +# This is a temporary solution to override the real common_constraints.txt\n# In edx-lint, until the pyjwt constraint in edx-lint has been removed.\n# See BOM-2721 for more details.\n# Below is the copied and edited version of common_constraints\n +endef + COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt .PHONY: $(COMMON_CONSTRAINTS_TXT) $(COMMON_CONSTRAINTS_TXT): @@ -108,6 +112,8 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp requirements/common_constraints.txt + sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + mv requirements/common_constraints.tmp requirements/common_constraints.txt # Make sure to compile files after any other files they include! pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/edx_exams/settings/base.py b/edx_exams/settings/base.py index 63a933e9..16c16398 100644 --- a/edx_exams/settings/base.py +++ b/edx_exams/settings/base.py @@ -130,6 +130,11 @@ def root(*path_fragments): USE_TZ = True +# Django 4.0+ uses zoneinfo if this is not set. We can remove this and +# migrate to zoneinfo after Django 4.2 upgrade. See more on following url +# https://docs.djangoproject.com/en/4.2/releases/4.0/#zoneinfo-default-timezone-implementation +USE_DEPRECATED_PYTZ = True + LOCALE_PATHS = ( root('conf', 'locale'), ) diff --git a/requirements/base.txt b/requirements/base.txt index 3b984a87..0cbef941 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,11 +14,13 @@ attrs==23.1.0 # via # lti-consumer-xblock # openedx-events +backports-zoneinfo==0.2.1 + # via django bleach==6.1.0 # via lti-consumer-xblock -boto3==1.28.64 +boto3==1.28.69 # via fs-s3fs -botocore==1.31.64 +botocore==1.31.69 # via # boto3 # s3transfer @@ -28,7 +30,7 @@ cffi==1.16.0 # via # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via requests click==8.1.7 # via @@ -50,9 +52,9 @@ defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core -django==3.2.22 +django==4.2.6 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.in # django-appconf # django-config-models @@ -209,7 +211,7 @@ markupsafe==2.1.3 # xblock mysqlclient==2.2.0 # via -r requirements/base.in -newrelic==9.1.0 +newrelic==9.1.1 # via edx-django-utils oauthlib==3.2.2 # via @@ -270,7 +272,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.in - # django # djangorestframework # drf-yasg # xblock @@ -337,7 +338,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.17 +urllib3==1.26.18 # via # botocore # requests diff --git a/requirements/ci.txt b/requirements/ci.txt index d611fd0c..fefb1dff 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -26,5 +26,5 @@ tox==3.28.0 # via # -c requirements/common_constraints.txt # -r requirements/ci.in -virtualenv==20.24.5 +virtualenv==20.24.6 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 5a86f013..a5676767 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -1,3 +1,7 @@ +# This is a temporary solution to override the real common_constraints.txt +# In edx-lint, until the pyjwt constraint in edx-lint has been removed. +# See BOM-2721 for more details. +# Below is the copied and edited version of common_constraints # A central location for most common version constraints # (across edx repos) for pip-installation. @@ -14,7 +18,7 @@ # using LTS django version -Django<4.0 + # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a51cb08b..56cf95a2 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -8,5 +8,8 @@ # pin when possible. Writing an issue against the offending project and # linking to it here is good. + +Django<4.3 + # Common constraints for edx repos -c common_constraints.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 8112303c..89bee040 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,7 +12,7 @@ asgiref==3.7.2 # via # -r requirements/validation.txt # django -astroid==2.15.8 +astroid==3.0.1 # via # -r requirements/validation.txt # pylint @@ -26,15 +26,19 @@ attrs==23.1.0 # -r requirements/validation.txt # lti-consumer-xblock # openedx-events +backports-zoneinfo==0.2.1 + # via + # -r requirements/validation.txt + # django bleach==6.1.0 # via # -r requirements/validation.txt # lti-consumer-xblock -boto3==1.28.64 +boto3==1.28.69 # via # -r requirements/validation.txt # fs-s3fs -botocore==1.31.64 +botocore==1.31.69 # via # -r requirements/validation.txt # boto3 @@ -54,7 +58,7 @@ cffi==1.16.0 # pynacl chardet==5.2.0 # via diff-cover -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/validation.txt # requests @@ -94,7 +98,6 @@ cryptography==41.0.4 # via # -r requirements/validation.txt # pyjwt - # secretstorage # social-auth-core ddt==1.6.0 # via -r requirements/validation.txt @@ -113,7 +116,7 @@ distlib==0.3.7 # via # -r requirements/validation.txt # virtualenv -django==3.2.22 +django==4.2.6 # via # -r requirements/validation.txt # django-appconf @@ -259,7 +262,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/validation.txt -faker==19.10.0 +faker==19.11.0 # via # -r requirements/validation.txt # factory-boy @@ -323,11 +326,6 @@ jaraco-classes==3.3.0 # via # -r requirements/validation.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/validation.txt - # keyring - # secretstorage jinja2==3.1.2 # via # -r requirements/validation.txt @@ -352,10 +350,6 @@ lazy==1.6 # -r requirements/validation.txt # lti-consumer-xblock # xblock -lazy-object-proxy==1.9.0 - # via - # -r requirements/validation.txt - # astroid lti-consumer-xblock==9.6.2 # via -r requirements/validation.txt lxml==4.9.3 @@ -396,7 +390,7 @@ more-itertools==10.1.0 # jaraco-classes mysqlclient==2.2.0 # via -r requirements/validation.txt -newrelic==9.1.0 +newrelic==9.1.1 # via # -r requirements/validation.txt # edx-django-utils @@ -502,7 +496,7 @@ pyjwt[crypto]==2.8.0 # edx-rest-api-client # pyjwt # social-auth-core -pylint==2.17.7 +pylint==3.0.2 # via # -r requirements/validation.txt # edx-lint @@ -513,7 +507,7 @@ pylint-celery==0.3 # via # -r requirements/validation.txt # edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via # -r requirements/validation.txt # edx-lint @@ -563,7 +557,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/validation.txt - # django # djangorestframework # drf-yasg # xblock @@ -619,10 +612,6 @@ s3transfer==0.7.0 # via # -r requirements/validation.txt # boto3 -secretstorage==3.3.3 - # via - # -r requirements/validation.txt - # keyring semantic-version==2.10.0 # via # -r requirements/validation.txt @@ -715,14 +704,14 @@ uritemplate==4.1.1 # -r requirements/validation.txt # coreapi # drf-yasg -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/validation.txt # botocore # requests # responses # twine -virtualenv==20.24.5 +virtualenv==20.24.6 # via # -r requirements/validation.txt # tox @@ -747,10 +736,6 @@ wheel==0.41.2 # via # -r requirements/pip-tools.txt # pip-tools -wrapt==1.15.0 - # via - # -r requirements/validation.txt - # astroid xblock[django]==1.8.1 # via # -r requirements/validation.txt diff --git a/requirements/django.txt b/requirements/django.txt index 5a28da34..7ac6d4fc 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.22 +django==4.2.6 diff --git a/requirements/doc.txt b/requirements/doc.txt index ccb79b69..68c4bd99 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -14,7 +14,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.8 +astroid==3.0.1 # via # -r requirements/test.txt # pylint @@ -30,15 +30,19 @@ attrs==23.1.0 # openedx-events babel==2.13.0 # via sphinx +backports-zoneinfo==0.2.1 + # via + # -r requirements/test.txt + # django bleach==6.1.0 # via # -r requirements/test.txt # lti-consumer-xblock -boto3==1.28.64 +boto3==1.28.69 # via # -r requirements/test.txt # fs-s3fs -botocore==1.31.64 +botocore==1.31.69 # via # -r requirements/test.txt # boto3 @@ -54,7 +58,7 @@ cffi==1.16.0 # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/test.txt # requests @@ -92,7 +96,6 @@ cryptography==41.0.4 # via # -r requirements/test.txt # pyjwt - # secretstorage # social-auth-core ddt==1.6.0 # via -r requirements/test.txt @@ -109,9 +112,9 @@ distlib==0.3.7 # via # -r requirements/test.txt # virtualenv -django==3.2.22 +django==4.2.6 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/test.txt # django-appconf # django-config-models @@ -256,7 +259,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.10.0 +faker==19.11.0 # via # -r requirements/test.txt # factory-boy @@ -317,10 +320,6 @@ itypes==1.2.0 # coreapi jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.2 # via # -r requirements/test.txt @@ -343,10 +342,6 @@ lazy==1.6 # -r requirements/test.txt # lti-consumer-xblock # xblock -lazy-object-proxy==1.9.0 - # via - # -r requirements/test.txt - # astroid lti-consumer-xblock==9.6.2 # via -r requirements/test.txt lxml==4.9.3 @@ -380,7 +375,7 @@ more-itertools==10.1.0 # via jaraco-classes mysqlclient==2.2.0 # via -r requirements/test.txt -newrelic==9.1.0 +newrelic==9.1.1 # via # -r requirements/test.txt # edx-django-utils @@ -471,7 +466,7 @@ pyjwt[crypto]==2.8.0 # edx-rest-api-client # pyjwt # social-auth-core -pylint==2.17.7 +pylint==3.0.2 # via # -r requirements/test.txt # edx-lint @@ -482,7 +477,7 @@ pylint-celery==0.3 # via # -r requirements/test.txt # edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via # -r requirements/test.txt # edx-lint @@ -531,7 +526,6 @@ pytz==2023.3.post1 # via # -r requirements/test.txt # babel - # django # djangorestframework # drf-yasg # xblock @@ -581,8 +575,6 @@ s3transfer==0.7.0 # via # -r requirements/test.txt # boto3 -secretstorage==3.3.3 - # via keyring semantic-version==2.10.0 # via # -r requirements/test.txt @@ -691,14 +683,14 @@ uritemplate==4.1.1 # -r requirements/test.txt # coreapi # drf-yasg -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/test.txt # botocore # requests # responses # twine -virtualenv==20.24.5 +virtualenv==20.24.6 # via # -r requirements/test.txt # tox @@ -719,10 +711,6 @@ webob==1.8.7 # via # -r requirements/test.txt # xblock -wrapt==1.15.0 - # via - # -r requirements/test.txt - # astroid xblock[django]==1.8.1 # via # -r requirements/test.txt diff --git a/requirements/pip.txt b/requirements/pip.txt index 2154d29f..0c788d61 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.41.2 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3 +pip==23.3.1 # via -r requirements/pip.in setuptools==68.2.2 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 5fcb3f72..5bdad797 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -21,15 +21,19 @@ attrs==23.1.0 # -r requirements/base.txt # lti-consumer-xblock # openedx-events +backports-zoneinfo==0.2.1 + # via + # -r requirements/base.txt + # django bleach==6.1.0 # via # -r requirements/base.txt # lti-consumer-xblock -boto3==1.28.64 +boto3==1.28.69 # via # -r requirements/base.txt # fs-s3fs -botocore==1.31.64 +botocore==1.31.69 # via # -r requirements/base.txt # boto3 @@ -43,7 +47,7 @@ cffi==1.16.0 # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/base.txt # requests @@ -75,7 +79,7 @@ defusedxml==0.8.0rc2 # -r requirements/base.txt # python3-openid # social-auth-core -django==3.2.22 +django==4.2.6 # via # -r requirements/base.txt # django-appconf @@ -279,7 +283,7 @@ mysqlclient==2.2.0 # via # -r requirements/base.txt # -r requirements/production.in -newrelic==9.1.0 +newrelic==9.1.1 # via # -r requirements/base.txt # edx-django-utils @@ -371,7 +375,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt - # django # djangorestframework # drf-yasg # xblock @@ -464,7 +467,7 @@ uritemplate==4.1.1 # -r requirements/base.txt # coreapi # drf-yasg -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/base.txt # botocore diff --git a/requirements/quality.txt b/requirements/quality.txt index b1611905..1b15d32a 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -12,7 +12,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.8 +astroid==3.0.1 # via # -r requirements/test.txt # pylint @@ -26,15 +26,19 @@ attrs==23.1.0 # -r requirements/test.txt # lti-consumer-xblock # openedx-events +backports-zoneinfo==0.2.1 + # via + # -r requirements/test.txt + # django bleach==6.1.0 # via # -r requirements/test.txt # lti-consumer-xblock -boto3==1.28.64 +boto3==1.28.69 # via # -r requirements/test.txt # fs-s3fs -botocore==1.31.64 +botocore==1.31.69 # via # -r requirements/test.txt # boto3 @@ -48,7 +52,7 @@ cffi==1.16.0 # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/test.txt # requests @@ -86,7 +90,6 @@ cryptography==41.0.4 # via # -r requirements/test.txt # pyjwt - # secretstorage # social-auth-core ddt==1.6.0 # via -r requirements/test.txt @@ -103,9 +106,9 @@ distlib==0.3.7 # via # -r requirements/test.txt # virtualenv -django==3.2.22 +django==4.2.6 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/test.txt # django-appconf # django-config-models @@ -244,7 +247,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.10.0 +faker==19.11.0 # via # -r requirements/test.txt # factory-boy @@ -302,10 +305,6 @@ itypes==1.2.0 # coreapi jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.2 # via # -r requirements/test.txt @@ -327,10 +326,6 @@ lazy==1.6 # -r requirements/test.txt # lti-consumer-xblock # xblock -lazy-object-proxy==1.9.0 - # via - # -r requirements/test.txt - # astroid lti-consumer-xblock==9.6.2 # via -r requirements/test.txt lxml==4.9.3 @@ -364,7 +359,7 @@ more-itertools==10.1.0 # via jaraco-classes mysqlclient==2.2.0 # via -r requirements/test.txt -newrelic==9.1.0 +newrelic==9.1.1 # via # -r requirements/test.txt # edx-django-utils @@ -455,7 +450,7 @@ pyjwt[crypto]==2.8.0 # edx-rest-api-client # pyjwt # social-auth-core -pylint==2.17.7 +pylint==3.0.2 # via # -r requirements/test.txt # edx-lint @@ -466,7 +461,7 @@ pylint-celery==0.3 # via # -r requirements/test.txt # edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via # -r requirements/test.txt # edx-lint @@ -512,7 +507,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/test.txt - # django # djangorestframework # drf-yasg # xblock @@ -559,8 +553,6 @@ s3transfer==0.7.0 # via # -r requirements/test.txt # boto3 -secretstorage==3.3.3 - # via keyring semantic-version==2.10.0 # via # -r requirements/test.txt @@ -648,14 +640,14 @@ uritemplate==4.1.1 # -r requirements/test.txt # coreapi # drf-yasg -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/test.txt # botocore # requests # responses # twine -virtualenv==20.24.5 +virtualenv==20.24.6 # via # -r requirements/test.txt # tox @@ -676,10 +668,6 @@ webob==1.8.7 # via # -r requirements/test.txt # xblock -wrapt==1.15.0 - # via - # -r requirements/test.txt - # astroid xblock[django]==1.8.1 # via # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index 10b0817c..3f7366ff 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,7 +12,7 @@ asgiref==3.7.2 # via # -r requirements/base.txt # django -astroid==2.15.8 +astroid==3.0.1 # via # pylint # pylint-celery @@ -25,15 +25,19 @@ attrs==23.1.0 # -r requirements/base.txt # lti-consumer-xblock # openedx-events +backports-zoneinfo==0.2.1 + # via + # -r requirements/base.txt + # django bleach==6.1.0 # via # -r requirements/base.txt # lti-consumer-xblock -boto3==1.28.64 +boto3==1.28.69 # via # -r requirements/base.txt # fs-s3fs -botocore==1.31.64 +botocore==1.31.69 # via # -r requirements/base.txt # boto3 @@ -47,7 +51,7 @@ cffi==1.16.0 # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/base.txt # requests @@ -96,7 +100,7 @@ dill==0.3.7 distlib==0.3.7 # via virtualenv # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.txt # django-appconf # django-config-models @@ -229,7 +233,7 @@ exceptiongroup==1.1.3 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==19.10.0 +faker==19.11.0 # via factory-boy fastavro==1.8.4 # via @@ -290,8 +294,6 @@ lazy==1.6 # -r requirements/base.txt # lti-consumer-xblock # xblock -lazy-object-proxy==1.9.0 - # via astroid lti-consumer-xblock==9.6.2 # via -r requirements/base.txt lxml==4.9.3 @@ -317,7 +319,7 @@ mock==5.1.0 # via -r requirements/test.in mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==9.1.0 +newrelic==9.1.1 # via # -r requirements/base.txt # edx-django-utils @@ -392,7 +394,7 @@ pyjwt[crypto]==2.8.0 # edx-rest-api-client # pyjwt # social-auth-core -pylint==2.17.7 +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -400,7 +402,7 @@ pylint==2.17.7 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via edx-lint pylint-plugin-utils==0.8.2 # via @@ -442,7 +444,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt - # django # djangorestframework # drf-yasg # xblock @@ -556,13 +557,13 @@ uritemplate==4.1.1 # -r requirements/base.txt # coreapi # drf-yasg -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/base.txt # botocore # requests # responses -virtualenv==20.24.5 +virtualenv==20.24.6 # via tox walrus==0.9.3 # via @@ -581,8 +582,6 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -wrapt==1.15.0 - # via astroid xblock[django]==1.8.1 # via # -r requirements/base.txt diff --git a/requirements/validation.txt b/requirements/validation.txt index 51a6a454..fe550bc2 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -14,7 +14,7 @@ asgiref==3.7.2 # -r requirements/quality.txt # -r requirements/test.txt # django -astroid==2.15.8 +astroid==3.0.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -31,17 +31,22 @@ attrs==23.1.0 # -r requirements/test.txt # lti-consumer-xblock # openedx-events +backports-zoneinfo==0.2.1 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # django bleach==6.1.0 # via # -r requirements/quality.txt # -r requirements/test.txt # lti-consumer-xblock -boto3==1.28.64 +boto3==1.28.69 # via # -r requirements/quality.txt # -r requirements/test.txt # fs-s3fs -botocore==1.31.64 +botocore==1.31.69 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -58,7 +63,7 @@ cffi==1.16.0 # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -104,7 +109,6 @@ cryptography==41.0.4 # -r requirements/quality.txt # -r requirements/test.txt # pyjwt - # secretstorage # social-auth-core ddt==1.6.0 # via @@ -126,7 +130,7 @@ distlib==0.3.7 # -r requirements/quality.txt # -r requirements/test.txt # virtualenv -django==3.2.22 +django==4.2.6 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -313,7 +317,7 @@ factory-boy==3.3.0 # via # -r requirements/quality.txt # -r requirements/test.txt -faker==19.10.0 +faker==19.11.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -388,11 +392,6 @@ jaraco-classes==3.3.0 # via # -r requirements/quality.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/quality.txt - # keyring - # secretstorage jinja2==3.1.2 # via # -r requirements/quality.txt @@ -420,11 +419,6 @@ lazy==1.6 # -r requirements/test.txt # lti-consumer-xblock # xblock -lazy-object-proxy==1.9.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # astroid lti-consumer-xblock==9.6.2 # via # -r requirements/quality.txt @@ -474,7 +468,7 @@ mysqlclient==2.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -newrelic==9.1.0 +newrelic==9.1.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -586,7 +580,7 @@ pyjwt[crypto]==2.8.0 # edx-rest-api-client # pyjwt # social-auth-core -pylint==2.17.7 +pylint==3.0.2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -599,7 +593,7 @@ pylint-celery==0.3 # -r requirements/quality.txt # -r requirements/test.txt # edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -660,7 +654,6 @@ pytz==2023.3.post1 # via # -r requirements/quality.txt # -r requirements/test.txt - # django # djangorestframework # drf-yasg # xblock @@ -722,10 +715,6 @@ s3transfer==0.7.0 # -r requirements/quality.txt # -r requirements/test.txt # boto3 -secretstorage==3.3.3 - # via - # -r requirements/quality.txt - # keyring semantic-version==2.10.0 # via # -r requirements/quality.txt @@ -829,7 +818,7 @@ uritemplate==4.1.1 # -r requirements/test.txt # coreapi # drf-yasg -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -837,7 +826,7 @@ urllib3==1.26.17 # requests # responses # twine -virtualenv==20.24.5 +virtualenv==20.24.6 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -863,11 +852,6 @@ webob==1.8.7 # -r requirements/quality.txt # -r requirements/test.txt # xblock -wrapt==1.15.0 - # via - # -r requirements/quality.txt - # -r requirements/test.txt - # astroid xblock[django]==1.8.1 # via # -r requirements/quality.txt diff --git a/tox.ini b/tox.ini index f79a6c3a..4c3003ee 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,42}, quality, docs, pii_check +envlist = py38-django{42}, quality, docs, pii_check skipsdist = true [doc8] @@ -43,7 +43,6 @@ filterwarnings = [testenv] deps = - django32: Django>=3.2,<4.0 django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt commands =