From 70c2b8bc6038ae435dc10988d88383dc34131dc1 Mon Sep 17 00:00:00 2001
From: Maari Tamm <maari.tamm@cleura.com>
Date: Wed, 2 Oct 2024 11:58:09 +0200
Subject: [PATCH] chore: Drop support for Python 3.8

Python 3.8 will end security support on 2024-10-31;
* Drop support for Python 3.8 in this plugin
* Update the Ubuntu base image to Jammy (22.04)
---
 .github/workflows/tox.yml                            | 1 -
 CHANGELOG.md                                         | 7 +++++++
 setup.py                                             | 3 +--
 tox.ini                                              | 3 +--
 tutorbackup/templates/backup/build/backup/Dockerfile | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index d9ef2c7..baca442 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 2b9d675..7937b40 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 3.3.0 (2024-07-31)
 
 * [Enhancement] Support Tutor 18 and Open edX Redwood.
diff --git a/setup.py b/setup.py
index b9f2ed5..0ac0cbb 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ def load_readme():
     long_description_content_type='text/markdown',
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     install_requires=["tutor <19, >=16.0.0"],
     setup_requires=["setuptools-scm"],
     entry_points={
@@ -39,7 +39,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 a71051f..02f5529 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/tutorbackup/templates/backup/build/backup/Dockerfile b/tutorbackup/templates/backup/build/backup/Dockerfile
index a6c4f45..c7c5f10 100644
--- a/tutorbackup/templates/backup/build/backup/Dockerfile
+++ b/tutorbackup/templates/backup/build/backup/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/ubuntu:20.04
+FROM docker.io/ubuntu:22.04
 ENV PYTHONUNBUFFERED 1
 
 RUN apt-get update && \