diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index ea4fe93..c21ed00 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -10,7 +10,6 @@ jobs: strategy: matrix: python-version: - - '3.8' - '3.9' - '3.10' - '3.11' diff --git a/CHANGELOG.md b/CHANGELOG.md index da0db80..551f8f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## Unreleased + +* [Enhancement] Drop support for Python 3.8; update the Ubuntu base image to + "Ubuntu Jammy" (22.04). + +When updating your plugin to this version, you'll need to rebuild the image. + ## Version 2.5.0 (2024-08-01) * [Enhancement] Support Tutor 18 and Open edX Redwood. diff --git a/README.md b/README.md index 77d050c..095c4b7 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,10 @@ appropriate one: | Lilac | `>=12.0, <13` | Not supported | Not supported | | Maple | `>=13.2, <14`[^1] | `maple` | 0.1.x | | Nutmeg | `>=14.0, <15` | `nutmeg` | 1.x.x | -| Olive | `>=15.0, <16` | `main` | 2.x.x | -| Palm | `>=16.0, <17` | `main` | 2.x.x | -| Quince | `>=17.0, <18` | `main` | 2.x.x | -| Redwood | `>=18.0, <19` | `main` | 2.x.x | +| Olive | `>=15.0, <16` | `quince` | `>=2.0.0, <3` | +| Palm | `>=16.0, <17` | `quince` | `>=2.2.0, <3` | +| Quince | `>=17.0, <18` | `quince` | `>=2.3.0, <3` | +| Redwood | `>=18.0, <19` | `main` | `>=2.5.0` | [^1]: For Open edX Maple and Tutor 13, you must run version 13.2.0 or  later. That is because this plugin uses the Tutor v1 plugin API, diff --git a/setup.py b/setup.py index b404e6e..f1b2fbd 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def load_readme(): long_description_content_type='text/markdown', packages=find_packages(exclude=["tests*"]), include_package_data=True, - python_requires=">=3.6", + python_requires=">=3.9", install_requires=["tutor <19, >=15.0.0"], setup_requires=["setuptools-scm"], entry_points={ @@ -38,7 +38,6 @@ def load_readme(): "License :: OSI Approved :: GNU Affero General Public License v3", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/tox.ini b/tox.ini index b293261..ce9d07f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] -envlist = gitlint,py{38,39,310,311,312},flake8 +envlist = gitlint,py{39,310,311,312},flake8 [gh-actions] python = - 3.8: gitlint,py38,flake8 3.9: gitlint,py39,flake8 3.10: gitlint,py310,flake8 3.11: gitlint,py311,flake8 diff --git a/tutorenrollmentreports/templates/enrollmentreports/build/enrollmentreports/Dockerfile b/tutorenrollmentreports/templates/enrollmentreports/build/enrollmentreports/Dockerfile index 36502ff..e0e868e 100644 --- a/tutorenrollmentreports/templates/enrollmentreports/build/enrollmentreports/Dockerfile +++ b/tutorenrollmentreports/templates/enrollmentreports/build/enrollmentreports/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 RUN mkdir -p /etc/ansible/roles/enrollmentreports /etc/ansible/group_vars RUN apt-get update && \ apt install -y ansible git default-mysql-client rsync