From 6aaba2bf3d75aad015731f74718dc7ee27074dd6 Mon Sep 17 00:00:00 2001
From: Joel Falknau <joel.falknau@gmail.com>
Date: Mon, 12 Aug 2024 13:19:08 +1000
Subject: [PATCH] Drop Python 3.8 and 3.9

---
 .gitlab-ci.yml          | 52 ++---------------------------------------
 .pre-commit-config.yaml |  2 +-
 pyproject.toml          |  4 +---
 tox.ini                 |  4 +---
 4 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41582a43..bdfbc79a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,30 +51,6 @@ secret_detection:
   stage: gitlab
   before_script: []
 
-test-3.8-core:
-  <<: *only-default
-  image: python:3.8-bullseye
-  script:
-    - tox -e py38-core
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.9-core:
-  <<: *only-default
-  image: python:3.9-bullseye
-  script:
-    - tox -e py39-core
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
 test-3.10-core:
   <<: *only-default
   image: python:3.10-bullseye
@@ -101,7 +77,7 @@ test-3.11-core:
 
 test-3.12-core:
   <<: *only-default
-  image: python:3.12-rc-bullseye
+  image: python:3.12-bullseye
   script:
     - tox -e py312-core
   artifacts:
@@ -111,30 +87,6 @@ test-3.12-core:
         coverage_format: cobertura
         path: coverage.xml
 
-test-3.8-all:
-  <<: *only-default
-  image: python:3.8-bullseye
-  script:
-    - tox -e py38-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.9-all:
-  <<: *only-default
-  image: python:3.9-bullseye
-  script:
-    - tox -e py39-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
 test-3.10-all:
   <<: *only-default
   image: python:3.10-bullseye
@@ -162,7 +114,7 @@ test-3.11-all:
 
 test-3.12-all:
   <<: *only-default
-  image: python:3.12-rc-bullseye
+  image: python:3.12-bullseye
   script:
     - tox -e py312-all
   artifacts:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 04c74b56..01bb6c7d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
     rev: v3.15.2
     hooks:
       - id: pyupgrade
-        args: [--py38-plus]
+        args: [--py310-plus]
   - repo: https://github.com/adamchainz/django-upgrade
     rev: 1.17.0
     hooks:
diff --git a/pyproject.toml b/pyproject.toml
index 3045997f..83cec687 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ license = { file = "LICENSE" }
 authors = [
     { name = "Alliance Auth", email = "adarnof@gmail.com" },
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",
@@ -25,8 +25,6 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
diff --git a/tox.ini b/tox.ini
index 6c90339e..0930e784 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,15 +2,13 @@
 isolated_build = true
 skipsdist = true
 usedevelop = true
-envlist = py{38,39,310,311,312}-{all,core}, docs
+envlist = py{310,311,312}-{all,core}, docs
 
 [testenv]
 setenv =
     all: DJANGO_SETTINGS_MODULE = tests.settings_all
     core: DJANGO_SETTINGS_MODULE = tests.settings_core
 basepython =
-    py38: python3.8
-    py39: python3.9
     py310: python3.10
     py311: python3.11
     py312: python3.12