diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9708dd62..38dc1b93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: fail-fast: false matrix: python-version: - - "3.11" - "3.12" env-name: ['django42','django52', 'quality'] db-version: ['mysql80'] diff --git a/.github/workflows/mysql8-migrations-check.yml b/.github/workflows/mysql8-migrations-check.yml index 49980414..46de8184 100644 --- a/.github/workflows/mysql8-migrations-check.yml +++ b/.github/workflows/mysql8-migrations-check.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - python-version: [ '3.11', '3.12' ] + python-version: [ '3.12' ] steps: - name: Checkout repo diff --git a/requirements.txt b/requirements.txt index a9e8370d..46fbb0f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,28 +1,28 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -asgiref==3.8.1 +asgiref==3.11.1 # via django backoff==2.2.1 # via -r requirements/base.in -boto3==1.38.43 +boto3==1.42.63 # via -r requirements/base.in -botocore==1.38.43 +botocore==1.42.63 # via # boto3 # s3transfer -certifi==2025.6.15 +certifi==2026.2.25 # via requests -cffi==1.17.1 +cffi==2.0.0 # via pynacl -charset-normalizer==3.4.2 +charset-normalizer==3.4.5 # via requests -click==8.2.1 +click==8.3.1 # via edx-django-utils -django==4.2.23 +django==5.2.12 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -39,57 +39,51 @@ django-waffle==5.0.0 # via edx-django-utils edx-django-release-util==1.5.0 # via -r requirements/base.in -edx-django-utils==8.0.0 +edx-django-utils==8.0.1 # via -r requirements/base.in -gunicorn==23.0.0 +gunicorn==25.1.0 # via -r requirements/base.in -idna==3.10 +idna==3.11 # via requests -isort==6.0.1 +isort==8.0.1 # via -r requirements/base.in -jmespath==1.0.1 +jmespath==1.1.0 # via # boto3 # botocore -mysqlclient==2.2.7 +mysqlclient==2.2.8 # via -r requirements/base.in -newrelic==10.14.0 +newrelic==11.5.0 # via -r requirements/base.in -packaging==25.0 +packaging==26.0 # via gunicorn -path==17.1.0 +path==17.1.1 # via -r requirements/base.in -pbr==6.1.1 - # via stevedore -psutil==7.0.0 +psutil==7.2.2 # via edx-django-utils -pycparser==2.22 +pycparser==3.0 # via cffi -pynacl==1.5.0 +pynacl==1.6.2 # via edx-django-utils python-dateutil==2.9.0.post0 # via botocore python-memcached==1.62 # via -r requirements/base.in -pyyaml==6.0.2 +pyyaml==6.0.3 # via edx-django-release-util -requests==2.32.4 +requests==2.32.5 # via -r requirements/base.in -s3transfer==0.13.0 +s3transfer==0.16.0 # via boto3 six==1.17.0 # via # edx-django-release-util # python-dateutil -sqlparse==0.5.3 +sqlparse==0.5.5 # via django -stevedore==5.4.1 +stevedore==5.7.0 # via edx-django-utils -urllib3==2.2.3 +urllib3==2.6.3 # via - # -c requirements/common_constraints.txt # botocore # requests - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/ci.txt b/requirements/ci.txt index ef6cc183..748a1aa5 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,34 +1,38 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -cachetools==6.1.0 - # via tox -chardet==5.2.0 +cachetools==7.0.3 # via tox colorama==0.4.6 # via tox -distlib==0.3.9 +distlib==0.4.0 # via virtualenv -filelock==3.18.0 +filelock==3.25.0 # via + # python-discovery # tox # virtualenv -packaging==25.0 +packaging==26.0 # via # pyproject-api # tox -platformdirs==4.3.8 +platformdirs==4.9.4 # via + # python-discovery # tox # virtualenv pluggy==1.6.0 # via tox -pyproject-api==1.9.1 +pyproject-api==1.10.0 + # via tox +python-discovery==1.1.1 + # via virtualenv +tomli-w==1.2.0 # via tox -tox==4.27.0 +tox==4.49.0 # via -r requirements/ci.in -virtualenv==20.31.2 +virtualenv==21.1.0 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 75193d3f..43c7b4d2 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -17,20 +17,9 @@ # this file from Github directly. It does not require packaging in edx-lint. # using LTS django version -Django<5.0 +Django<6.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 # See https://github.com/openedx/edx-platform/issues/35126 for more info 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 - -# Cause: https://github.com/openedx/edx-lint/issues/458 -# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved. -pip<24.3 - -# Cause: https://github.com/openedx/edx-lint/issues/475 -# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved. -urllib3<2.3.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index f5be1e05..ab976dd2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,47 +1,43 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -asgiref==3.8.1 +asgiref==3.11.1 # via # -r requirements/test.txt # django backoff==2.2.1 # via -r requirements/test.txt -boto3==1.38.43 +boto3==1.42.63 # via -r requirements/test.txt -botocore==1.38.43 +botocore==1.42.63 # via # -r requirements/test.txt # boto3 # s3transfer -build==1.2.2.post1 +build==1.4.0 # via # -r requirements/pip-tools.txt # pip-tools -cachetools==6.1.0 +cachetools==7.0.3 # via # -r requirements/ci.txt # tox -certifi==2025.6.15 +certifi==2026.2.25 # via # -r requirements/test.txt # requests -cffi==1.17.1 +cffi==2.0.0 # via # -r requirements/test.txt # pynacl -chardet==5.2.0 - # via - # -r requirements/ci.txt - # tox -charset-normalizer==3.4.2 +charset-normalizer==3.4.5 # via # -r requirements/test.txt # requests -click==8.2.1 +click==8.3.1 # via # -r requirements/pip-tools.txt # -r requirements/test.txt @@ -51,15 +47,15 @@ colorama==0.4.6 # via # -r requirements/ci.txt # tox -coverage[toml]==7.9.1 +coverage[toml]==7.13.4 # via # -r requirements/test.txt # pytest-cov -distlib==0.3.9 +distlib==0.4.0 # via # -r requirements/ci.txt # virtualenv -django==4.2.23 +django==5.2.12 # via # -c requirements/common_constraints.txt # -r requirements/test.txt @@ -80,35 +76,36 @@ django-waffle==5.0.0 # edx-django-utils edx-django-release-util==1.5.0 # via -r requirements/test.txt -edx-django-utils==8.0.0 +edx-django-utils==8.0.1 # via -r requirements/test.txt -filelock==3.18.0 +filelock==3.25.0 # via # -r requirements/ci.txt + # python-discovery # tox # virtualenv -gunicorn==23.0.0 +gunicorn==25.1.0 # via -r requirements/test.txt -idna==3.10 +idna==3.11 # via # -r requirements/test.txt # requests -iniconfig==2.1.0 +iniconfig==2.3.0 # via # -r requirements/test.txt # pytest -isort==6.0.1 +isort==8.0.1 # via -r requirements/test.txt -jmespath==1.0.1 +jmespath==1.1.0 # via # -r requirements/test.txt # boto3 # botocore -mysqlclient==2.2.7 +mysqlclient==2.2.8 # via -r requirements/test.txt -newrelic==10.14.0 +newrelic==11.5.0 # via -r requirements/test.txt -packaging==25.0 +packaging==26.0 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -118,17 +115,15 @@ packaging==25.0 # pyproject-api # pytest # tox -path==17.1.0 + # wheel +path==17.1.1 # via -r requirements/test.txt -pbr==6.1.1 - # via - # -r requirements/test.txt - # stevedore -pip-tools==7.4.1 +pip-tools==7.5.3 # via -r requirements/pip-tools.txt -platformdirs==4.3.8 +platformdirs==4.9.4 # via # -r requirements/ci.txt + # python-discovery # tox # virtualenv pluggy==1.6.0 @@ -138,13 +133,13 @@ pluggy==1.6.0 # pytest # pytest-cov # tox -psutil==7.0.0 +psutil==7.2.2 # via # -r requirements/test.txt # edx-django-utils pycodestyle==2.14.0 # via -r requirements/quality.txt -pycparser==2.22 +pycparser==3.0 # via # -r requirements/test.txt # cffi @@ -152,11 +147,11 @@ pygments==2.19.2 # via # -r requirements/test.txt # pytest -pynacl==1.5.0 +pynacl==1.6.2 # via # -r requirements/test.txt # edx-django-utils -pyproject-api==1.9.1 +pyproject-api==1.10.0 # via # -r requirements/ci.txt # tox @@ -165,28 +160,34 @@ pyproject-hooks==1.2.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.4.1 +pytest==9.0.2 # via # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==6.2.1 +pytest-cov==7.0.0 # via -r requirements/test.txt -pytest-django==4.11.1 +pytest-django==4.12.0 # via -r requirements/test.txt python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # botocore +python-discovery==1.1.1 + # via + # -r requirements/ci.txt + # virtualenv python-memcached==1.62 # via -r requirements/test.txt -pyyaml==6.0.2 +pywatchman==3.0.0 ; "linux" in sys_platform + # via -r requirements/dev.in +pyyaml==6.0.3 # via # -r requirements/test.txt # edx-django-release-util -requests==2.32.4 +requests==2.32.5 # via -r requirements/test.txt -s3transfer==0.13.0 +s3transfer==0.16.0 # via # -r requirements/test.txt # boto3 @@ -195,27 +196,30 @@ six==1.17.0 # -r requirements/test.txt # edx-django-release-util # python-dateutil -sqlparse==0.5.3 +sqlparse==0.5.5 # via # -r requirements/test.txt # django -stevedore==5.4.1 +stevedore==5.7.0 # via # -r requirements/test.txt # edx-django-utils -tox==4.27.0 +tomli-w==1.2.0 + # via + # -r requirements/ci.txt + # tox +tox==4.49.0 # via -r requirements/ci.txt -urllib3==2.2.3 +urllib3==2.6.3 # via - # -c requirements/common_constraints.txt # -r requirements/test.txt # botocore # requests -virtualenv==20.31.2 +virtualenv==21.1.0 # via # -r requirements/ci.txt # tox -wheel==0.45.1 +wheel==0.46.3 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 990b4234..d89516b8 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,22 +1,24 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -build==1.2.2.post1 +build==1.4.0 # via pip-tools -click==8.2.1 +click==8.3.1 # via pip-tools -packaging==25.0 - # via build -pip-tools==7.4.1 +packaging==26.0 + # via + # build + # wheel +pip-tools==7.5.3 # via -r requirements/pip-tools.in pyproject-hooks==1.2.0 # via # build # pip-tools -wheel==0.45.1 +wheel==0.46.3 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index dabfa8f0..084d708e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,16 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -wheel==0.45.1 +packaging==26.0 + # via wheel +wheel==0.46.3 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.2 - # via - # -c requirements/common_constraints.txt - # -r requirements/pip.in -setuptools==80.9.0 +pip==26.0.1 + # via -r requirements/pip.in +setuptools==82.0.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 12a5f8a5..f01ae5db 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/test.txt b/requirements/test.txt index e2b2f497..b3990fad 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,43 +1,43 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -asgiref==3.8.1 +asgiref==3.11.1 # via - # -r requirements/../requirements.txt + # -r requirements.txt # django backoff==2.2.1 - # via -r requirements/../requirements.txt -boto3==1.38.43 - # via -r requirements/../requirements.txt -botocore==1.38.43 + # via -r requirements.txt +boto3==1.42.63 + # via -r requirements.txt +botocore==1.42.63 # via - # -r requirements/../requirements.txt + # -r requirements.txt # boto3 # s3transfer -certifi==2025.6.15 +certifi==2026.2.25 # via - # -r requirements/../requirements.txt + # -r requirements.txt # requests -cffi==1.17.1 +cffi==2.0.0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # pynacl -charset-normalizer==3.4.2 +charset-normalizer==3.4.5 # via - # -r requirements/../requirements.txt + # -r requirements.txt # requests -click==8.2.1 +click==8.3.1 # via - # -r requirements/../requirements.txt + # -r requirements.txt # edx-django-utils -coverage[toml]==7.9.1 +coverage[toml]==7.13.4 # via pytest-cov # via # -c requirements/common_constraints.txt - # -r requirements/../requirements.txt + # -r requirements.txt # django-crum # django-storages # django-waffle @@ -45,110 +45,102 @@ coverage[toml]==7.9.1 # edx-django-utils django-crum==0.7.9 # via - # -r requirements/../requirements.txt + # -r requirements.txt # edx-django-utils django-storages==1.14.6 - # via -r requirements/../requirements.txt + # via -r requirements.txt django-waffle==5.0.0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # edx-django-utils edx-django-release-util==1.5.0 - # via -r requirements/../requirements.txt -edx-django-utils==8.0.0 - # via -r requirements/../requirements.txt -gunicorn==23.0.0 - # via -r requirements/../requirements.txt -idna==3.10 - # via - # -r requirements/../requirements.txt + # via -r requirements.txt +edx-django-utils==8.0.1 + # via -r requirements.txt +gunicorn==25.1.0 + # via -r requirements.txt +idna==3.11 + # via + # -r requirements.txt # requests -iniconfig==2.1.0 +iniconfig==2.3.0 # via pytest -isort==6.0.1 - # via -r requirements/../requirements.txt -jmespath==1.0.1 +isort==8.0.1 + # via -r requirements.txt +jmespath==1.1.0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # boto3 # botocore -mysqlclient==2.2.7 - # via -r requirements/../requirements.txt -newrelic==10.14.0 - # via -r requirements/../requirements.txt -packaging==25.0 +mysqlclient==2.2.8 + # via -r requirements.txt +newrelic==11.5.0 + # via -r requirements.txt +packaging==26.0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # gunicorn # pytest -path==17.1.0 - # via -r requirements/../requirements.txt -pbr==6.1.1 - # via - # -r requirements/../requirements.txt - # stevedore +path==17.1.1 + # via -r requirements.txt pluggy==1.6.0 # via # pytest # pytest-cov -psutil==7.0.0 +psutil==7.2.2 # via - # -r requirements/../requirements.txt + # -r requirements.txt # edx-django-utils -pycparser==2.22 +pycparser==3.0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # cffi pygments==2.19.2 # via pytest -pynacl==1.5.0 +pynacl==1.6.2 # via - # -r requirements/../requirements.txt + # -r requirements.txt # edx-django-utils -pytest==8.4.1 +pytest==9.0.2 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==6.2.1 +pytest-cov==7.0.0 # via -r requirements/test.in -pytest-django==4.11.1 +pytest-django==4.12.0 # via -r requirements/test.in python-dateutil==2.9.0.post0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # botocore python-memcached==1.62 - # via -r requirements/../requirements.txt -pyyaml==6.0.2 + # via -r requirements.txt +pyyaml==6.0.3 # via - # -r requirements/../requirements.txt + # -r requirements.txt # edx-django-release-util -requests==2.32.4 - # via -r requirements/../requirements.txt -s3transfer==0.13.0 +requests==2.32.5 + # via -r requirements.txt +s3transfer==0.16.0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # boto3 six==1.17.0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # edx-django-release-util # python-dateutil -sqlparse==0.5.3 +sqlparse==0.5.5 # via - # -r requirements/../requirements.txt + # -r requirements.txt # django -stevedore==5.4.1 +stevedore==5.7.0 # via - # -r requirements/../requirements.txt + # -r requirements.txt # edx-django-utils -urllib3==2.2.3 +urllib3==2.6.3 # via - # -c requirements/common_constraints.txt - # -r requirements/../requirements.txt + # -r requirements.txt # botocore # requests - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/tox.ini b/tox.ini index 8ab2fb21..32c0a685 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{311,312}-django{42,52},py{311,312}-quality +envlist = py312-django{42,52},py312-quality skipsdist = True [pycodestyle]