From 503a54a61cfbc6ea154ed3c68b8ad6af8fe6451a Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Fri, 23 Feb 2024 07:37:50 -0500 Subject: [PATCH 1/5] feat: add python 3.12 support --- .github/workflows/ci.yml | 2 +- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd9504f3..d831d507 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: tox-env: [quality, django42] - python-version: [3.8] + python-version: [3.8, '3.8', '3.12'] db-version: ['mysql80'] steps: diff --git a/tox.ini b/tox.ini index f86f0fd0..efa09ee2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,12 @@ [tox] -envlist = py38-django{42},quality +envlist = py{38, 312}-django{42},quality skipsdist = True [pycodestyle] max-line-length = 120 [pytest] -DJANGO_SETTINGS_MODULE = xqueue.test_settings +django_settings_module = xqueue.test_settings addopts = --nomigrations --reuse-db --durations=20 filterwarnings = default norecursedirs = .* jenkins load_tests log reports script test_framework xqueue From 22374b4ddfaca9a7b50827022a7acd9bfe875db3 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Thu, 28 Mar 2024 15:01:52 +0500 Subject: [PATCH 2/5] fix: Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d831d507..da117ec7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: tox-env: [quality, django42] - python-version: [3.8, '3.8', '3.12'] + python-version: ['3.8', '3.12'] db-version: ['mysql80'] steps: From 5231cb67e4ac454e90913fc9c2c59652a5c23413 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 5 Apr 2024 16:14:36 +0500 Subject: [PATCH 3/5] feat: Adding python3.11 support. --- .github/workflows/ci.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da117ec7..60c041aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: tox-env: [quality, django42] - python-version: ['3.8', '3.12'] + python-version: ['3.8', '3.11'] db-version: ['mysql80'] steps: diff --git a/tox.ini b/tox.ini index efa09ee2..1df110fb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38, 312}-django{42},quality +envlist = py{38, 311}-django{42},quality skipsdist = True [pycodestyle] From 7d7a74660b045e56ea976ac139886f77d46b6826 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Fri, 5 Apr 2024 08:35:04 -0400 Subject: [PATCH 4/5] chore: Updating Python Requirements (#930) --- requirements.txt | 48 ++++++------ requirements/ci.txt | 38 ++++++---- requirements/common_constraints.txt | 13 +++- requirements/dev.txt | 114 +++++++++++++++------------- requirements/pip-tools.txt | 20 +++-- requirements/pip.txt | 6 +- requirements/test.txt | 62 ++++++++------- 7 files changed, 164 insertions(+), 137 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4e8f7ac9..837cc691 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,28 +4,29 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via django backoff==2.2.1 # via -r requirements/base.in backports-zoneinfo==0.2.1 # via django -boto3==1.28.68 +boto3==1.34.78 # via -r requirements/base.in -botocore==1.31.68 +botocore==1.34.78 # via # boto3 # s3transfer -certifi==2023.7.22 +certifi==2024.2.2 # via requests cffi==1.16.0 # via pynacl -charset-normalizer==3.3.1 +charset-normalizer==3.3.2 # via requests click==8.1.7 # via edx-django-utils -django==4.2.6 +django==4.2.11 # via + # -c requirements/common_constraints.txt # -r requirements/base.in # django-crum # django-storages @@ -36,64 +37,63 @@ django-crum==0.7.9 # via edx-django-utils django-storages==1.14.2 # via -r requirements/base.in -django-waffle==4.0.0 +django-waffle==4.1.0 # via edx-django-utils -edx-django-release-util==1.3.0 +edx-django-release-util==1.4.0 # via -r requirements/base.in -edx-django-utils==5.7.0 +edx-django-utils==5.12.0 # via -r requirements/base.in gunicorn==21.2.0 # via -r requirements/base.in -idna==3.4 +idna==3.6 # via requests -isort==5.12.0 +isort==5.13.2 # via -r requirements/base.in jmespath==1.0.1 # via # boto3 # botocore -mysqlclient==2.2.0 +mysqlclient==2.2.4 # via -r requirements/base.in -newrelic==9.1.1 +newrelic==9.8.0 # via # -r requirements/base.in # edx-django-utils -packaging==23.2 +packaging==24.0 # via gunicorn path-py==11.0.1 # via -r requirements/base.in -pbr==5.11.1 +pbr==6.0.0 # via stevedore -psutil==5.9.6 +psutil==5.9.8 # via edx-django-utils -pycparser==2.21 +pycparser==2.22 # via cffi pynacl==1.5.0 # via edx-django-utils -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via botocore -python-memcached==1.59 +python-memcached==1.62 # via -r requirements/base.in python-termstyle==0.1.10 # via -r requirements/base.in -pytz==2023.3.post1 +pytz==2024.1 # via -r requirements/base.in pyyaml==6.0.1 # via edx-django-release-util requests==2.31.0 # via -r requirements/base.in -s3transfer==0.7.0 +s3transfer==0.10.1 # via boto3 six==1.16.0 # via # edx-django-release-util # python-dateutil - # python-memcached sqlparse==0.4.4 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via edx-django-utils -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via asgiref urllib3==1.26.18 # via diff --git a/requirements/ci.txt b/requirements/ci.txt index d611fd0c..c085cbcf 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,27 +4,35 @@ # # make upgrade # -distlib==0.3.7 +cachetools==5.3.3 + # via tox +chardet==5.2.0 + # via tox +colorama==0.4.6 + # via tox +distlib==0.3.8 # via virtualenv -filelock==3.12.4 +filelock==3.13.3 # via # tox # virtualenv -packaging==23.2 - # via tox -platformdirs==3.11.0 - # via virtualenv -pluggy==1.3.0 - # via tox -py==1.11.0 +packaging==24.0 + # via + # pyproject-api + # tox +platformdirs==4.2.0 + # via + # tox + # virtualenv +pluggy==1.4.0 # via tox -six==1.16.0 +pyproject-api==1.6.1 # via tox tomli==2.0.1 - # via tox -tox==3.28.0 # via - # -c requirements/common_constraints.txt - # -r requirements/ci.in -virtualenv==20.24.5 + # pyproject-api + # tox +tox==4.14.2 + # via -r requirements/ci.in +virtualenv==20.25.1 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 0091b9ec..c9d8d9cc 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -18,7 +18,7 @@ # using LTS django version - +Django<5.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 @@ -27,6 +27,11 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 -# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. -# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 -tox<4.0.0 +# opentelemetry requires version 6.x at the moment: +# https://github.com/open-telemetry/opentelemetry-python/issues/3570 +# Normally this could be added as a constraint in edx-django-utils, where we're +# adding the opentelemetry dependency. However, when we compile pip-tools.txt, +# that uses version 7.x, and then there's no undoing that when compiling base.txt. +# So we need to pin it globally, for now. +# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 +importlib-metadata<7 diff --git a/requirements/dev.txt b/requirements/dev.txt index ecd64120..a34b3ee4 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/test.txt # django @@ -14,18 +14,22 @@ backports-zoneinfo==0.2.1 # via # -r requirements/test.txt # django -boto3==1.28.68 +boto3==1.34.78 # via -r requirements/test.txt -botocore==1.31.68 +botocore==1.34.78 # via # -r requirements/test.txt # boto3 # s3transfer -build==1.0.3 +build==1.2.1 # via # -r requirements/pip-tools.txt # pip-tools -certifi==2023.7.22 +cachetools==5.3.3 + # via + # -r requirements/ci.txt + # tox +certifi==2024.2.2 # via # -r requirements/test.txt # requests @@ -33,7 +37,11 @@ cffi==1.16.0 # via # -r requirements/test.txt # pynacl -charset-normalizer==3.3.1 +chardet==5.2.0 + # via + # -r requirements/ci.txt + # tox +charset-normalizer==3.3.2 # via # -r requirements/test.txt # requests @@ -43,17 +51,21 @@ click==8.1.7 # -r requirements/test.txt # edx-django-utils # pip-tools -coverage[toml]==7.3.2 +colorama==0.4.6 + # via + # -r requirements/ci.txt + # tox +coverage[toml]==7.4.4 # via # -r requirements/test.txt - # coverage # pytest-cov -distlib==0.3.7 +distlib==0.3.8 # via # -r requirements/ci.txt # virtualenv -django==4.2.6 +django==4.2.11 # via + # -c requirements/common_constraints.txt # -r requirements/test.txt # django-crum # django-storages @@ -66,88 +78,87 @@ django-crum==0.7.9 # edx-django-utils django-storages==1.14.2 # via -r requirements/test.txt -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/test.txt # edx-django-utils -edx-django-release-util==1.3.0 +edx-django-release-util==1.4.0 # via -r requirements/test.txt -edx-django-utils==5.7.0 +edx-django-utils==5.12.0 # via -r requirements/test.txt -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 # via # -r requirements/test.txt # pytest -filelock==3.12.4 +filelock==3.13.3 # via # -r requirements/ci.txt # tox # virtualenv gunicorn==21.2.0 # via -r requirements/test.txt -idna==3.4 +idna==3.6 # via # -r requirements/test.txt # requests -importlib-metadata==6.8.0 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/pip-tools.txt # build iniconfig==2.0.0 # via # -r requirements/test.txt # pytest -isort==5.12.0 +isort==5.13.2 # via -r requirements/test.txt jmespath==1.0.1 # via # -r requirements/test.txt # boto3 # botocore -mysqlclient==2.2.0 +mysqlclient==2.2.4 # via -r requirements/test.txt -newrelic==9.1.1 +newrelic==9.8.0 # via # -r requirements/test.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt # -r requirements/test.txt # build # gunicorn + # pyproject-api # pytest # tox path-py==11.0.1 # via -r requirements/test.txt -pbr==5.11.1 +pbr==6.0.0 # via # -r requirements/test.txt # stevedore -pip-tools==7.3.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==3.11.0 +platformdirs==4.2.0 # via # -r requirements/ci.txt + # tox # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via # -r requirements/ci.txt # -r requirements/test.txt # pytest # tox -psutil==5.9.6 +psutil==5.9.8 # via # -r requirements/test.txt # edx-django-utils -py==1.11.0 - # via - # -r requirements/ci.txt - # tox pycodestyle==2.11.1 # via -r requirements/quality.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/test.txt # cffi @@ -155,30 +166,35 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils +pyproject-api==1.6.1 + # via + # -r requirements/ci.txt + # tox pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt # build -pytest==7.4.2 + # pip-tools +pytest==8.1.1 # via # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.txt -pytest-django==4.5.2 +pytest-django==4.8.0 # via -r requirements/test.txt -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # botocore -python-memcached==1.59 +python-memcached==1.62 # via -r requirements/test.txt python-termstyle==0.1.10 # via -r requirements/test.txt -pytz==2023.3.post1 +pytz==2024.1 # via -r requirements/test.txt -pywatchman==1.4.1 ; "linux" in sys_platform +pywatchman==2.0.0 ; "linux" in sys_platform # via -r requirements/dev.in pyyaml==6.0.1 # via @@ -186,23 +202,20 @@ pyyaml==6.0.1 # edx-django-release-util requests==2.31.0 # via -r requirements/test.txt -s3transfer==0.7.0 +s3transfer==0.10.1 # via # -r requirements/test.txt # boto3 six==1.16.0 # via - # -r requirements/ci.txt # -r requirements/test.txt # edx-django-release-util # python-dateutil - # python-memcached - # tox sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/test.txt # edx-django-utils @@ -214,14 +227,13 @@ tomli==2.0.1 # build # coverage # pip-tools + # pyproject-api # pyproject-hooks # pytest # tox -tox==3.28.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/ci.txt -typing-extensions==4.8.0 +tox==4.14.2 + # via -r requirements/ci.txt +typing-extensions==4.10.0 # via # -r requirements/test.txt # asgiref @@ -230,15 +242,15 @@ urllib3==1.26.18 # -r requirements/test.txt # botocore # requests -virtualenv==20.24.5 +virtualenv==20.25.1 # via # -r requirements/ci.txt # tox -wheel==0.41.2 +wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 50d35f22..6401f544 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,26 +4,30 @@ # # make upgrade # -build==1.0.3 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.8.0 - # via build -packaging==23.2 +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build +packaging==24.0 # via build -pip-tools==7.3.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 - # via build + # via + # build + # pip-tools tomli==2.0.1 # via # build # pip-tools # pyproject-hooks -wheel==0.41.2 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 0c788d61..cf449024 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.2 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==24.0 # via -r requirements/pip.in -setuptools==68.2.2 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 1324825e..b6e2d310 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/../requirements.txt # django @@ -14,14 +14,14 @@ backports-zoneinfo==0.2.1 # via # -r requirements/../requirements.txt # django -boto3==1.28.68 +boto3==1.34.78 # via -r requirements/../requirements.txt -botocore==1.31.68 +botocore==1.34.78 # via # -r requirements/../requirements.txt # boto3 # s3transfer -certifi==2023.7.22 +certifi==2024.2.2 # via # -r requirements/../requirements.txt # requests @@ -29,7 +29,7 @@ cffi==1.16.0 # via # -r requirements/../requirements.txt # pynacl -charset-normalizer==3.3.1 +charset-normalizer==3.3.2 # via # -r requirements/../requirements.txt # requests @@ -37,11 +37,10 @@ click==8.1.7 # via # -r requirements/../requirements.txt # edx-django-utils -coverage[toml]==7.3.2 - # via - # coverage - # pytest-cov +coverage[toml]==7.4.4 + # via pytest-cov # via + # -c requirements/common_constraints.txt # -r requirements/../requirements.txt # django-crum # django-storages @@ -54,55 +53,55 @@ django-crum==0.7.9 # edx-django-utils django-storages==1.14.2 # via -r requirements/../requirements.txt -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/../requirements.txt # edx-django-utils -edx-django-release-util==1.3.0 +edx-django-release-util==1.4.0 # via -r requirements/../requirements.txt -edx-django-utils==5.7.0 +edx-django-utils==5.12.0 # via -r requirements/../requirements.txt -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 # via pytest gunicorn==21.2.0 # via -r requirements/../requirements.txt -idna==3.4 +idna==3.6 # via # -r requirements/../requirements.txt # requests iniconfig==2.0.0 # via pytest -isort==5.12.0 +isort==5.13.2 # via -r requirements/../requirements.txt jmespath==1.0.1 # via # -r requirements/../requirements.txt # boto3 # botocore -mysqlclient==2.2.0 +mysqlclient==2.2.4 # via -r requirements/../requirements.txt -newrelic==9.1.1 +newrelic==9.8.0 # via # -r requirements/../requirements.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via # -r requirements/../requirements.txt # gunicorn # pytest path-py==11.0.1 # via -r requirements/../requirements.txt -pbr==5.11.1 +pbr==6.0.0 # via # -r requirements/../requirements.txt # stevedore -pluggy==1.3.0 +pluggy==1.4.0 # via pytest -psutil==5.9.6 +psutil==5.9.8 # via # -r requirements/../requirements.txt # edx-django-utils -pycparser==2.21 +pycparser==2.22 # via # -r requirements/../requirements.txt # cffi @@ -110,24 +109,24 @@ pynacl==1.5.0 # via # -r requirements/../requirements.txt # edx-django-utils -pytest==7.4.2 +pytest==8.1.1 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in -pytest-django==4.5.2 +pytest-django==4.8.0 # via -r requirements/test.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/../requirements.txt # botocore -python-memcached==1.59 +python-memcached==1.62 # via -r requirements/../requirements.txt python-termstyle==0.1.10 # via -r requirements/../requirements.txt -pytz==2023.3.post1 +pytz==2024.1 # via -r requirements/../requirements.txt pyyaml==6.0.1 # via @@ -135,7 +134,7 @@ pyyaml==6.0.1 # edx-django-release-util requests==2.31.0 # via -r requirements/../requirements.txt -s3transfer==0.7.0 +s3transfer==0.10.1 # via # -r requirements/../requirements.txt # boto3 @@ -144,12 +143,11 @@ six==1.16.0 # -r requirements/../requirements.txt # edx-django-release-util # python-dateutil - # python-memcached sqlparse==0.4.4 # via # -r requirements/../requirements.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/../requirements.txt # edx-django-utils @@ -157,7 +155,7 @@ tomli==2.0.1 # via # coverage # pytest -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # -r requirements/../requirements.txt # asgiref From f816267c492f454c67dbfeb760bd9b11878d7617 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Sat, 6 Apr 2024 14:11:00 +0500 Subject: [PATCH 5/5] fix: Update tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 67c8a515..0dfeb123 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38, 311}-django{42},quality +envlist = py{38, 312}-django{42},quality skipsdist = True [pycodestyle]