From b31bc4e59ece965fef423a38abec3859474419ab Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Sat, 24 Dec 2022 13:15:07 +0000
Subject: [PATCH] Remove support for python 3.8

---
 .github/workflows/release.yml          |  4 ++--
 .github/workflows/tox.yml              |  6 +-----
 molecule_vagrant/playbooks/prepare.yml |  2 +-
 setup.cfg                              |  3 +--
 tox.ini                                | 10 +++++-----
 zuul.d/layout.yaml                     | 11 -----------
 6 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4e8d4eb..1c21d2f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,11 +17,11 @@ jobs:
       TOX_PARALLEL_NO_SPINNER: 1
 
     steps:
-    - name: Switch to using Python 3.8 by default
+    - name: Switch to using Python 3.9 by default
       uses: actions/setup-python@v4
       with:
         cache: pip
-        python-version: 3.8
+        python-version: 3.9
     - name: Install tox
       run: >-
         python3 -m
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 2aff62f..3a7e96b 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -31,10 +31,6 @@ jobs:
           - tox_env: lint
             platform: ubuntu-latest
             skip_vagrant: true
-          - tox_env: py38
-            PREFIX: PYTEST_REQPASS=11
-            platform: macos-12
-            python_version: "3.8"
           - tox_env: py39,py39-devel
             PREFIX: PYTEST_REQPASS=11
             platform: macos-12
@@ -71,7 +67,7 @@ jobs:
       - name: Set up Python version
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python_version || '3.8' }}
+          python-version: ${{ matrix.python_version || '3.9' }}
           cache: pip
 
       - name: Install dependencies
diff --git a/molecule_vagrant/playbooks/prepare.yml b/molecule_vagrant/playbooks/prepare.yml
index 7853966..004681c 100644
--- a/molecule_vagrant/playbooks/prepare.yml
+++ b/molecule_vagrant/playbooks/prepare.yml
@@ -11,7 +11,7 @@
         (test -e /usr/bin/apt && (apt -y update && apt install -y python3-minimal)) ||
         (test -e /usr/bin/yum && sudo yum -y -qq install python3) ||
         (test -e /usr/sbin/pkg && sudo env ASSUME_ALWAYS_YES=yes pkg update && sudo env ASSUME_ALWAYS_YES=yes pkg install python3) ||
-        (test -e /usr/sbin/pkg_add && sudo /usr/sbin/pkg_add -U -I -x python%3.8) ||
+        (test -e /usr/sbin/pkg_add && sudo /usr/sbin/pkg_add -U -I -x python%3.9) ||
         echo "Warning: Python not bootstrapped due to unknown platform."
         )
       become: true
diff --git a/setup.cfg b/setup.cfg
index 7a3ee85..8179099 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,6 @@ classifiers =
     Operating System :: OS Independent
 
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
 
@@ -46,7 +45,7 @@ keywords =
 
 [options]
 use_scm_version = True
-python_requires = >=3.8
+python_requires = >=3.9
 packages = find:
 include_package_data = True
 zip_safe = False
diff --git a/tox.ini b/tox.ini
index 5032cf8..a47f8ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 # For more information about tox, see https://tox.readthedocs.io/en/latest/
 [tox]
-minversion = 3.24.4
+minversion = 4.0.16
 envlist =
     lint
     packaging
-    py{38,39,310,311}
-    py{39,310,311}-{devel}
+    py
+    py-devel
 isolated_build = True
 requires =
     pip >= 21.3.1
@@ -18,8 +18,8 @@ extras =
 deps =
     --editable .
     ansible-core
-    py{39,310,311}: molecule[test]
-    py{38,39,310,311}-{devel}: git+https://github.com/ansible-community/molecule.git@main#egg=molecule[test]
+    py{39,310,311,312}: molecule[test]
+    py{39,310,311,312}-{devel}: git+https://github.com/ansible-community/molecule.git@main#egg=molecule[test]
 commands =
     pytest --collect-only
     # -s is added in order to allow live output on long running functional tests
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index bd763f0..60a1f15 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -21,19 +21,8 @@
       tox_envlist: py39
     timeout: 5400  # 1.5h
 
-- job:
-    name: molecule-vagrant-fedora-py38
-    description: Run py38 tox environment
-    parent: ansible-tox-py38
-    nodeset: fedora-latest-1vcpu
-    attempts: 2
-    vars:
-      tox_envlist: py38
-    timeout: 5400  # 1.5h
-
 - project:
     check:
       jobs: &defaults
         - molecule-vagrant-fedora-py310
         - molecule-vagrant-fedora-py39
-        - molecule-vagrant-fedora-py38