From 995f7ab837e967c1760701f688331c4e2e3c8d46 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 18 Sep 2024 10:58:19 -0400 Subject: [PATCH 1/3] feat!: Update cookiecutters to Python 3.12 Even thought we were previously running tests on python 3.11, the cookiecutters themselves were not updated to run on 3.11. So they failed when 3.8 was not available on the host system. Update everything to run on python 3.12 including the defaults for the cookiecut repos so that any new systems are creted with the latest version of python we support as a community. --- .github/workflows/ci.yml | 6 ++---- Makefile | 2 +- README.rst | 4 ++-- cookiecutter-django-app/{{cookiecutter.repo_name}}/tox.ini | 5 ++--- cookiecutter-django-ida/{{cookiecutter.repo_name}}/tox.ini | 5 ++--- cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini | 5 ++--- .../{{cookiecutter.placeholder_repo_name}}/tox.ini | 2 +- tox.ini | 2 +- 8 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57af4bce..598173d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: - - '3.8' - - '3.11' + - '3.12' toxenv: [py, quality] steps: @@ -53,8 +52,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: - - '3.8' - - '3.11' + - '3.12' steps: - uses: actions/checkout@v4 diff --git a/Makefile b/Makefile index b1163832..532a3f1f 100644 --- a/Makefile +++ b/Makefile @@ -60,4 +60,4 @@ test: ## run tests on every supported Python version tox validate: ## run tests and quality checks - tox -e quality,py38 + tox -e quality,py diff --git a/README.rst b/README.rst index 36fdc603..6317c689 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,7 @@ Using the cookiecutters cd edx-cookiecutters # Set up a virtualenv using virtualenvwrapper with the same name as the repo and activate it - mkvirtualenv -p python3.8 edx-cookiecutters + mkvirtualenv -p python3.12 edx-cookiecutters 2. Create a cookiecutter Repository =================================== @@ -77,7 +77,7 @@ Directions for contributing to this repository cd edx-cookiecutters # Set up a virtualenv using virtualenvwrapper with the same name as the repo and activate it - mkvirtualenv -p python3.8 edx-cookiecutters + mkvirtualenv -p python3.12 edx-cookiecutters # Activate the virtualenv workon edx-cookiecutters diff --git a/cookiecutter-django-app/{{cookiecutter.repo_name}}/tox.ini b/cookiecutter-django-app/{{cookiecutter.repo_name}}/tox.ini index 05d2e910..03c20e2d 100644 --- a/cookiecutter-django-app/{{cookiecutter.repo_name}}/tox.ini +++ b/cookiecutter-django-app/{{cookiecutter.repo_name}}/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40} +envlist = py312-django{42} [doc8] ; D001 = Line too long @@ -36,8 +36,7 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = - django32: Django>=3.2,<4.0 - django40: Django>=4.0,<4.1 + django42: Django>=4.0,<5.0 -r{toxinidir}/requirements/test.txt commands = python manage.py check diff --git a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/tox.ini b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/tox.ini index 8112b5ac..9148f530 100644 --- a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/tox.ini +++ b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40}, quality, docs, pii_check +envlist = py312-django{42}, quality, docs, pii_check skipsdist = true [doc8] @@ -43,8 +43,7 @@ filterwarnings = [testenv] deps = - django32: Django>=3.2,<4.0 - django40: Django>=4.0,<4.1 + django42: Django>=4.0,<5.0 -r{toxinidir}/requirements/test.txt commands = pytest {posargs} diff --git a/cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini b/cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini index bf3ae14a..bcaa1625 100644 --- a/cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini +++ b/cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40}, quality, docs +envlist = py312-django{42}, quality, docs skipsdist = true [doc8] @@ -37,8 +37,7 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = - django32: Django>=3.2,<4.0 - django40: Django>=4.0,<4.1 + django42: Django>=4.0,<5.0 -r{toxinidir}/requirements/test.txt allowlist_externals = mkdir diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/tox.ini b/python-template/{{cookiecutter.placeholder_repo_name}}/tox.ini index d7ac37c4..ad57ff4b 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/tox.ini +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38} +envlist = py{312} [doc8] ; D001 = Line too long diff --git a/tox.ini b/tox.ini index 4aa4eb79..582e8c64 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38,311,312} +envlist = py{312} skipsdist = true [isort] From 293ae2ff9a28012ce013df19f725db8374035e24 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 26 Sep 2024 15:49:27 -0400 Subject: [PATCH 2/3] build: Explicitly declare a dependency on setuptools. This is needed as long as we're using setup.py to build our packages. --- Makefile | 8 ++++---- .../Makefile | 14 +++++++------- .../requirements/base.in | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 532a3f1f..4dc71821 100644 --- a/Makefile +++ b/Makefile @@ -25,10 +25,10 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt - $(PIP_COMPILE) -o requirements/base.txt requirements/base.in - $(PIP_COMPILE) -o requirements/test.txt requirements/test.in - $(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in - $(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in + $(PIP_COMPILE) --allow-unsafe -o requirements/base.txt requirements/base.in + $(PIP_COMPILE) --allow-unsafe -o requirements/test.txt requirements/test.in + $(PIP_COMPILE) --allow-unsafe -o requirements/ci.txt requirements/ci.in + $(PIP_COMPILE) --allow-unsafe -o requirements/dev.txt requirements/dev.in make upgrade_template diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/Makefile b/python-template/{{cookiecutter.placeholder_repo_name}}/Makefile index 699a081e..74abd7fc 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/Makefile +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/Makefile @@ -40,14 +40,14 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy pip install -r requirements/pip-tools.txt # Make sure to compile files after any other files they include! $(PIP_COMPILE) --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in - $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in + $(PIP_COMPILE) --allow-unsafe -o requirements/pip-tools.txt requirements/pip-tools.in pip install -r requirements/pip-tools.txt - $(PIP_COMPILE) -o requirements/base.txt requirements/base.in - $(PIP_COMPILE) -o requirements/test.txt requirements/test.in - $(PIP_COMPILE) -o requirements/doc.txt requirements/doc.in - $(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in - $(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in - $(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in + $(PIP_COMPILE) --allow-unsafe -o requirements/base.txt requirements/base.in + $(PIP_COMPILE) --allow-unsafe -o requirements/test.txt requirements/test.in + $(PIP_COMPILE) --allow-unsafe -o requirements/doc.txt requirements/doc.in + $(PIP_COMPILE) --allow-unsafe -o requirements/quality.txt requirements/quality.in + $(PIP_COMPILE) --allow-unsafe -o requirements/ci.txt requirements/ci.in + $(PIP_COMPILE) --allow-unsafe -o requirements/dev.txt requirements/dev.in quality: ## check coding style with pycodestyle and pylint touch tests/__init__.py diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/base.in b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/base.in index c6ccc1bb..48f56ddd 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/base.in +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/base.in @@ -1,3 +1,4 @@ # Core requirements for using this application -c constraints.txt +setuptools From b32828ba7ca00c56054a2704477985061284d4e2 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 26 Sep 2024 15:51:40 -0400 Subject: [PATCH 3/3] chore: Run `make upgrade` --- .../requirements/pip-tools.txt | 21 +-- .../requirements/pip.txt | 8 +- requirements/base.txt | 43 ++--- requirements/ci.txt | 22 +-- requirements/dev.txt | 176 ++++++++---------- requirements/pip-tools.txt | 21 +-- requirements/pip.txt | 8 +- requirements/test.txt | 157 +++++++--------- 8 files changed, 189 insertions(+), 267 deletions(-) diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip-tools.txt b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip-tools.txt index fe1d6475..ef5542c7 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip-tools.txt +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip-tools.txt @@ -1,34 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -build==1.1.1 +build==1.2.2 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # build -packaging==24.0 +packaging==24.1 # via build pip-tools==7.4.1 # via -r python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip-tools.in -pyproject-hooks==1.0.0 - # via - # build - # pip-tools -tomli==2.0.1 +pyproject-hooks==1.1.0 # via # build # pip-tools - # pyproject-hooks -wheel==0.43.0 +wheel==0.44.0 # via pip-tools -zipp==3.18.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.txt b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.txt index 81ac71e8..e0cc3441 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.txt +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -wheel==0.42.0 +wheel==0.44.0 # via -r python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.0 +pip==24.2 # via -r python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.in -setuptools==69.1.1 +setuptools==75.1.0 # via -r python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.in diff --git a/requirements/base.txt b/requirements/base.txt index a1c6ec97..c8b98f2e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,18 +1,18 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # arrow==1.3.0 # via cookiecutter -astroid==3.1.0 +astroid==3.3.4 # via # pylint # pylint-celery binaryornot==0.4.4 # via cookiecutter -certifi==2024.2.2 +certifi==2024.8.30 # via requests chardet==5.2.0 # via binaryornot @@ -26,19 +26,19 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.7.0 +code-annotations==1.8.0 # via edx-lint cookiecutter==2.6.0 # via -r requirements/base.in dill==0.3.8 # via pylint -edx-lint==5.3.6 +edx-lint==5.4.0 # via -r requirements/base.in -idna==3.6 +idna==3.10 # via requests isort==5.13.2 # via pylint -jinja2==3.1.3 +jinja2==3.1.4 # via # code-annotations # cookiecutter @@ -50,13 +50,13 @@ mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -pbr==6.0.0 +pbr==6.1.0 # via stevedore -platformdirs==4.2.0 +platformdirs==4.3.6 # via pylint -pygments==2.17.2 +pygments==2.18.0 # via rich -pylint==3.1.0 +pylint==3.3.1 # via # edx-lint # pylint-celery @@ -76,32 +76,25 @@ python-slugify==8.0.4 # via # code-annotations # cookiecutter -pyyaml==6.0.1 +pyyaml==6.0.2 # via # code-annotations # cookiecutter -requests==2.31.0 +requests==2.32.3 # via cookiecutter -rich==13.7.1 +rich==13.8.1 # via cookiecutter six==1.16.0 # via # edx-lint # python-dateutil -stevedore==5.2.0 +stevedore==5.3.0 # via code-annotations text-unidecode==1.3 # via python-slugify -tomli==2.0.1 +tomlkit==0.13.2 # via pylint -tomlkit==0.12.4 - # via pylint -types-python-dateutil==2.9.0.20240316 +types-python-dateutil==2.9.0.20240906 # via arrow -typing-extensions==4.10.0 - # via - # astroid - # pylint - # rich -urllib3==2.2.1 +urllib3==2.2.3 # via requests diff --git a/requirements/ci.txt b/requirements/ci.txt index c085cbcf..466d8b7e 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -cachetools==5.3.3 +cachetools==5.5.0 # via tox chardet==5.2.0 # via tox @@ -12,27 +12,23 @@ colorama==0.4.6 # via tox distlib==0.3.8 # via virtualenv -filelock==3.13.3 +filelock==3.16.1 # via # tox # virtualenv -packaging==24.0 +packaging==24.1 # via # pyproject-api # tox -platformdirs==4.2.0 +platformdirs==4.3.6 # via # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via tox -pyproject-api==1.6.1 +pyproject-api==1.8.0 # via tox -tomli==2.0.1 - # via - # pyproject-api - # tox -tox==4.14.2 +tox==4.20.0 # via -r requirements/ci.in -virtualenv==20.25.1 +virtualenv==20.26.5 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index ac06e6f5..7d8e9a2d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via # -r requirements/test.txt # pydata-sphinx-theme -alabaster==0.7.13 +alabaster==0.7.16 # via # -r requirements/test.txt # sphinx @@ -16,16 +16,16 @@ arrow==1.3.0 # via # -r requirements/test.txt # cookiecutter -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.1.0 +astroid==3.3.4 # via # -r requirements/test.txt # pylint # pylint-celery -babel==2.14.0 +babel==2.16.0 # via # -r requirements/test.txt # pydata-sphinx-theme @@ -38,20 +38,20 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -build==1.0.3 +build==1.2.2 # via # -r requirements/pip-tools.txt # -r requirements/test.txt # pip-tools -cachetools==5.3.2 +cachetools==5.5.0 # via # -r requirements/ci.txt # tox -certifi==2024.2.2 +certifi==2024.8.30 # via # -r requirements/test.txt # requests -cffi==1.16.0 +cffi==1.17.1 # via # -r requirements/test.txt # cryptography @@ -78,7 +78,7 @@ click-log==0.4.0 # via # -r requirements/test.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.8.0 # via # -r requirements/test.txt # edx-lint @@ -90,7 +90,7 @@ cookiecutter==2.6.0 # via # -r requirements/test.txt # pytest-cookies -cryptography==42.0.5 +cryptography==43.0.1 # via # -r requirements/test.txt # secretstorage @@ -103,18 +103,18 @@ distlib==0.3.8 # -r requirements/ci.txt # -r requirements/test.txt # virtualenv -django==3.2.24 +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-model-utils -django-model-utils==4.4.0 +django-model-utils==5.0.0 # via -r requirements/test.txt doc8==0.11.2 # via # -c requirements/constraints.txt # -r requirements/test.txt -docutils==0.19 +docutils==0.20.1 # via # -r requirements/test.txt # doc8 @@ -123,19 +123,15 @@ docutils==0.19 # restructuredtext-lint # sphinx # sphinx-rtd-theme -edx-lint==5.3.6 +edx-lint==5.4.0 # via -r requirements/test.txt -exceptiongroup==1.2.0 - # via - # -r requirements/test.txt - # pytest -filelock==3.13.1 +filelock==3.16.1 # via # -r requirements/ci.txt # -r requirements/test.txt # tox # virtualenv -idna==3.6 +idna==3.10 # via # -r requirements/test.txt # requests @@ -143,18 +139,10 @@ imagesize==1.4.1 # via # -r requirements/test.txt # sphinx -importlib-metadata==7.0.1 +importlib-metadata==8.5.0 # via - # -r requirements/pip-tools.txt # -r requirements/test.txt - # build - # keyring - # sphinx # twine -importlib-resources==6.1.2 - # via - # -r requirements/test.txt - # keyring iniconfig==2.0.0 # via # -r requirements/test.txt @@ -163,7 +151,15 @@ isort==5.13.2 # via # -r requirements/test.txt # pylint -jaraco-classes==3.3.1 +jaraco-classes==3.4.0 + # via + # -r requirements/test.txt + # keyring +jaraco-context==6.0.1 + # via + # -r requirements/test.txt + # keyring +jaraco-functools==4.0.2 # via # -r requirements/test.txt # keyring @@ -172,13 +168,13 @@ jeepney==0.8.0 # -r requirements/test.txt # keyring # secretstorage -jinja2==3.1.3 +jinja2==3.1.4 # via # -r requirements/test.txt # code-annotations # cookiecutter # sphinx -keyring==24.3.0 +keyring==25.4.1 # via # -r requirements/test.txt # twine @@ -198,15 +194,16 @@ mdurl==0.1.2 # via # -r requirements/test.txt # markdown-it-py -more-itertools==10.2.0 +more-itertools==10.5.0 # via # -r requirements/test.txt # jaraco-classes -nh3==0.2.15 + # jaraco-functools +nh3==0.2.18 # via # -r requirements/test.txt # readme-renderer -packaging==23.2 +packaging==24.1 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -217,42 +214,42 @@ packaging==23.2 # pytest # sphinx # tox -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/test.txt # stevedore -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.txt -pkginfo==1.9.6 +pkginfo==1.10.0 # via # -r requirements/test.txt # twine -platformdirs==4.2.0 +platformdirs==4.3.6 # via # -r requirements/ci.txt # -r requirements/test.txt # pylint # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/ci.txt # -r requirements/test.txt # pytest # tox -pycodestyle==2.11.1 +pycodestyle==2.12.1 # via -r requirements/test.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/test.txt # cffi -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.4 # via # -r requirements/test.txt # sphinx-book-theme pydocstyle==6.3.0 # via -r requirements/test.txt -pygments==2.17.2 +pygments==2.18.0 # via # -r requirements/test.txt # accessible-pygments @@ -261,7 +258,7 @@ pygments==2.17.2 # readme-renderer # rich # sphinx -pylint==3.1.0 +pylint==3.3.1 # via # -r requirements/test.txt # edx-lint @@ -281,23 +278,23 @@ pylint-plugin-utils==0.8.2 # -r requirements/test.txt # pylint-celery # pylint-django -pyproject-api==1.6.1 +pyproject-api==1.8.0 # via # -r requirements/ci.txt # tox -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # -r requirements/pip-tools.txt # -r requirements/test.txt # build # pip-tools -pytest==8.0.2 +pytest==8.3.3 # via # -r requirements/test.txt # pytest-cookies pytest-cookies==0.7.0 # via -r requirements/test.txt -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # arrow @@ -306,21 +303,16 @@ python-slugify==8.0.4 # -r requirements/test.txt # code-annotations # cookiecutter -pytz==2024.1 - # via - # -r requirements/test.txt - # babel - # django -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/test.txt # code-annotations # cookiecutter -readme-renderer==42.0 +readme-renderer==43.0 # via # -r requirements/test.txt # twine -requests==2.31.0 +requests==2.32.3 # via # -r requirements/test.txt # cookiecutter @@ -339,7 +331,7 @@ rfc3986==2.0.0 # via # -r requirements/test.txt # twine -rich==13.7.0 +rich==13.8.1 # via # -r requirements/test.txt # cookiecutter @@ -348,7 +340,7 @@ secretstorage==3.3.3 # via # -r requirements/test.txt # keyring -sh==2.0.6 +sh==2.0.7 # via -r requirements/test.txt six==1.16.0 # via @@ -360,30 +352,30 @@ snowballstemmer==2.2.0 # -r requirements/test.txt # pydocstyle # sphinx -soupsieve==2.5 +soupsieve==2.6 # via # -r requirements/test.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==7.4.7 # via # -r requirements/test.txt # pydata-sphinx-theme # sphinx-book-theme # sphinx-rtd-theme # sphinxcontrib-jquery -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r requirements/test.txt sphinx-rtd-theme==2.0.0 # via -r requirements/test.txt -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via # -r requirements/test.txt # sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via # -r requirements/test.txt # sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via # -r requirements/test.txt # sphinx @@ -395,19 +387,19 @@ sphinxcontrib-jsmath==1.0.1 # via # -r requirements/test.txt # sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via # -r requirements/test.txt # sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via # -r requirements/test.txt # sphinx -sqlparse==0.4.4 +sqlparse==0.5.1 # via # -r requirements/test.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/test.txt # code-annotations @@ -416,59 +408,43 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/ci.txt - # -r requirements/pip-tools.txt - # -r requirements/test.txt - # build - # pip-tools - # pylint - # pyproject-api - # pyproject-hooks - # pytest - # tox -tomlkit==0.12.3 +tomlkit==0.13.2 # via # -r requirements/test.txt # pylint -tox==4.13.0 +tox==4.20.0 # via -r requirements/ci.txt -twine==5.0.0 +twine==5.1.1 # via -r requirements/test.txt -types-python-dateutil==2.8.19.20240106 +types-python-dateutil==2.9.0.20240906 # via # -r requirements/test.txt # arrow -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -r requirements/test.txt - # asgiref - # astroid # pydata-sphinx-theme - # pylint - # rich -urllib3==2.2.1 +urllib3==2.2.3 # via # -r requirements/test.txt # requests # twine -virtualenv==20.25.1 +virtualenv==20.26.5 # via # -r requirements/ci.txt # -r requirements/test.txt # tox -wheel==0.42.0 +wheel==0.44.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.17.0 +zipp==3.20.2 # via - # -r requirements/pip-tools.txt # -r requirements/test.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools +pip==24.2 + # via pip-tools +setuptools==75.1.0 + # via pip-tools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index aad9d382..e6268ff6 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,34 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -build==1.1.1 +build==1.2.2 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # build -packaging==24.0 +packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.0.0 - # via - # build - # pip-tools -tomli==2.0.1 +pyproject-hooks==1.1.0 # via # build # pip-tools - # pyproject-hooks -wheel==0.43.0 +wheel==0.44.0 # via pip-tools -zipp==3.18.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 66656035..488d41f8 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -wheel==0.42.0 +wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.0 +pip==24.2 # via -r requirements/pip.in -setuptools==69.1.1 +setuptools==75.1.0 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index d06acdfd..6b81af0e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,25 +1,25 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx arrow==1.3.0 # via # -r requirements/base.txt # cookiecutter -asgiref==3.7.2 +asgiref==3.8.1 # via django -astroid==3.1.0 +astroid==3.3.4 # via # -r requirements/base.txt # pylint # pylint-celery -babel==2.14.0 +babel==2.16.0 # via # pydata-sphinx-theme # sphinx @@ -29,13 +29,13 @@ binaryornot==0.4.4 # via # -r requirements/base.txt # cookiecutter -build==1.0.3 +build==1.2.2 # via -r requirements/test.in -certifi==2024.2.2 +certifi==2024.8.30 # via # -r requirements/base.txt # requests -cffi==1.16.0 +cffi==1.17.1 # via cryptography chardet==5.2.0 # via @@ -56,7 +56,7 @@ click-log==0.4.0 # via # -r requirements/base.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.8.0 # via # -r requirements/base.txt # edx-lint @@ -64,7 +64,7 @@ cookiecutter==2.6.0 # via # -r requirements/base.txt # pytest-cookies -cryptography==42.0.5 +cryptography==43.0.1 # via secretstorage dill==0.3.8 # via @@ -72,18 +72,18 @@ dill==0.3.8 # pylint distlib==0.3.8 # via virtualenv -django==3.2.24 +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.in # django-model-utils -django-model-utils==4.4.0 +django-model-utils==5.0.0 # via -r requirements/test.in doc8==0.11.2 # via # -c requirements/constraints.txt # -r requirements/test.in -docutils==0.19 +docutils==0.20.1 # via # doc8 # pydata-sphinx-theme @@ -91,28 +91,20 @@ docutils==0.19 # restructuredtext-lint # sphinx # sphinx-rtd-theme -edx-lint==5.3.6 +edx-lint==5.4.0 # via # -r requirements/base.txt # -r requirements/test.in -exceptiongroup==1.2.0 - # via pytest -filelock==3.13.1 +filelock==3.16.1 # via virtualenv -idna==3.6 +idna==3.10 # via # -r requirements/base.txt # requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.1 - # via - # build - # keyring - # sphinx - # twine -importlib-resources==6.1.2 - # via keyring +importlib-metadata==8.5.0 + # via twine iniconfig==2.0.0 # via pytest isort==5.13.2 @@ -120,19 +112,23 @@ isort==5.13.2 # -r requirements/base.txt # -r requirements/test.in # pylint -jaraco-classes==3.3.1 +jaraco-classes==3.4.0 + # via keyring +jaraco-context==6.0.1 + # via keyring +jaraco-functools==4.0.2 # via keyring jeepney==0.8.0 # via # keyring # secretstorage -jinja2==3.1.3 +jinja2==3.1.4 # via # -r requirements/base.txt # code-annotations # cookiecutter # sphinx -keyring==24.3.0 +keyring==25.4.1 # via twine markdown-it-py==3.0.0 # via @@ -150,38 +146,40 @@ mdurl==0.1.2 # via # -r requirements/base.txt # markdown-it-py -more-itertools==10.2.0 - # via jaraco-classes -nh3==0.2.15 +more-itertools==10.5.0 + # via + # jaraco-classes + # jaraco-functools +nh3==0.2.18 # via readme-renderer -packaging==23.2 +packaging==24.1 # via # build # pydata-sphinx-theme # pytest # sphinx -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/base.txt # stevedore -pkginfo==1.9.6 +pkginfo==1.10.0 # via twine -platformdirs==4.2.0 +platformdirs==4.3.6 # via # -r requirements/base.txt # pylint # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via pytest -pycodestyle==2.11.1 +pycodestyle==2.12.1 # via -r requirements/test.in -pycparser==2.21 +pycparser==2.22 # via cffi -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.4 # via sphinx-book-theme pydocstyle==6.3.0 # via -r requirements/test.in -pygments==2.17.2 +pygments==2.18.0 # via # -r requirements/base.txt # accessible-pygments @@ -190,7 +188,7 @@ pygments==2.17.2 # readme-renderer # rich # sphinx -pylint==3.1.0 +pylint==3.3.1 # via # -r requirements/base.txt # edx-lint @@ -210,13 +208,13 @@ pylint-plugin-utils==0.8.2 # -r requirements/base.txt # pylint-celery # pylint-django -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via build -pytest==8.0.2 +pytest==8.3.3 # via pytest-cookies pytest-cookies==0.7.0 # via -r requirements/test.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # arrow @@ -225,18 +223,14 @@ python-slugify==8.0.4 # -r requirements/base.txt # code-annotations # cookiecutter -pytz==2024.1 - # via - # babel - # django -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/base.txt # code-annotations # cookiecutter -readme-renderer==42.0 +readme-renderer==43.0 # via twine -requests==2.31.0 +requests==2.32.3 # via # -r requirements/base.txt # cookiecutter @@ -249,14 +243,14 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.7.0 +rich==13.8.1 # via # -r requirements/base.txt # cookiecutter # twine secretstorage==3.3.3 # via keyring -sh==2.0.6 +sh==2.0.7 # via -r requirements/test.in six==1.16.0 # via @@ -267,36 +261,36 @@ snowballstemmer==2.2.0 # via # pydocstyle # sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 -sphinx==6.2.1 +sphinx==7.4.7 # via # -r requirements/test.in # pydata-sphinx-theme # sphinx-book-theme # sphinx-rtd-theme # sphinxcontrib-jquery -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r requirements/test.in sphinx-rtd-theme==2.0.0 # via -r requirements/test.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jquery==4.1 # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.4.4 +sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/base.txt # code-annotations @@ -305,39 +299,24 @@ text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/base.txt - # build - # pylint - # pyproject-hooks - # pytest -tomlkit==0.12.3 +tomlkit==0.13.2 # via # -r requirements/base.txt # pylint -twine==5.0.0 +twine==5.1.1 # via -r requirements/test.in -types-python-dateutil==2.8.19.20240106 +types-python-dateutil==2.9.0.20240906 # via # -r requirements/base.txt # arrow -typing-extensions==4.10.0 - # via - # -r requirements/base.txt - # asgiref - # astroid - # pydata-sphinx-theme - # pylint - # rich -urllib3==2.2.1 +typing-extensions==4.12.2 + # via pydata-sphinx-theme +urllib3==2.2.3 # via # -r requirements/base.txt # requests # twine -virtualenv==20.25.1 +virtualenv==20.26.5 # via -r requirements/test.in -zipp==3.17.0 - # via - # importlib-metadata - # importlib-resources +zipp==3.20.2 + # via importlib-metadata