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]