From 07c5b772e16c92cc8570de0dd8d0f81cb4f4b0e9 Mon Sep 17 00:00:00 2001
From: Joey Vagedes <joeyvagedes@microsoft.com>
Date: Thu, 5 Oct 2023 13:05:40 -0700
Subject: [PATCH] Initial commit

---
 .github/ISSUE_TEMPLATE/bug_report.yml  |  2 +-
 .github/workflows/VariableProducer.yml |  2 +-
 docs/contributor/python_release.md     | 20 +++++++++++++++-----
 pyproject.toml                         |  5 +++--
 readme.md                              |  8 ++++----
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index ad2ead5a9..82344710e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -48,9 +48,9 @@ body:
       description: "Note: Bug fixes are only supported on these Python versions."
       multiple: true
       options:
-        - Python 3.9
         - Python 3.10
         - Python 3.11
+        - Python 3.12
     validations:
       required: true
   - type: textarea
diff --git a/.github/workflows/VariableProducer.yml b/.github/workflows/VariableProducer.yml
index 36655e986..7237e3034 100644
--- a/.github/workflows/VariableProducer.yml
+++ b/.github/workflows/VariableProducer.yml
@@ -14,7 +14,7 @@ on:
         value: ${{ jobs.produce.outputs.node-versions }}
 
 env:
-  pythonversions: "['3.11', '3.10', '3.9']" # Keep Python Versions in descending order
+  pythonversions: "['3.12', '3.11', '3.10']" # Keep Python Versions in descending order
   nodeversions: "['19']"
 
 jobs:
diff --git a/docs/contributor/python_release.md b/docs/contributor/python_release.md
index ac1e6b3cc..349808818 100644
--- a/docs/contributor/python_release.md
+++ b/docs/contributor/python_release.md
@@ -9,17 +9,16 @@ released (3.9, 3.10, etc).
 Each individual step will be a different section below and be associated with
 a specific file that must be updated.
 
-### setup.py
+### pyproject.toml
 
 This file is responsible for the release process to pypi. We want to make sure
-we keep the required version for our pypi releases up to date. Within
-`setuptools.setup()` locate the line `python_requires = "XXX"` and update it to
-the next version.
+we keep the required version for our pypi releases up to date. Update
+`requires-python` to the minimum required python.
 
 We typically support the last three minor versions; barring any special
 exceptions, if the newest minor version is 3.11, then overall we will support
 3.9, 3.10, and 3.11. Therefore you should update the line to
-`python_requires = ">=3.9.0"`.
+`python-requires = ">=3.9"`.
 
 Additionally, we must update the classifiers section to show the three
 supported python versions:
@@ -32,3 +31,14 @@ classifiers=[
     "Programming Language :: Python :: 3.11"
 ]
 ```
+### bug_report.yml
+
+Update the supported python versions in the entry with `id: py_version`
+
+### VariableProducer.yml
+
+Update `pythonversions` to the support versions
+
+### readme.md
+
+Update the python versions in the `Current Status` section
diff --git a/pyproject.toml b/pyproject.toml
index f4881e280..7e6f1f9e4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,6 +9,7 @@ dynamic = ["version"]
 description = "Python library supporting UEFI EDK2 firmware development"
 readme = {file = "readme.md", content-type = "text/markdown"}
 license = {file = "LICENSE"}
+requires-python = ">=3.10"
 dependencies = [
     "pyasn1 >= 0.4.8",
     "pyasn1-modules >= 0.2.8",
@@ -22,9 +23,9 @@ classifiers=[
         "Operating System :: OS Independent",
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11"
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12"
     ]
 
 [project.urls]
diff --git a/readme.md b/readme.md
index 0b490163e..f9375f34d 100644
--- a/readme.md
+++ b/readme.md
@@ -26,15 +26,15 @@ Supported Versions
 
 |  Host Type         |  Toolchain    |  Status
 |  :---------------  |  :----------  |  :--------------------  |
-|  [Windows-Latest]  |  Python 3.9   |  [![ci]][_ci]           |
 |  [Windows-Latest]  |  Python 3.10  |  [![ci]][_ci]           |
 |  [Windows-Latest]  |  Python 3.11  |  [![ci]][_ci]           |
-|  [Ubuntu-Latest]   |  Python 3.9   |  [![ci]][_ci]           |
+|  [Windows-Latest]  |  Python 3.12  |  [![ci]][_ci]           |
 |  [Ubuntu-Latest]   |  Python 3.10  |  [![ci]][_ci]           |
 |  [Ubuntu-Latest]   |  Python 3.11  |  [![ci]][_ci]           |
-|  [MacOS-Latest]    |  Python 3.9   |  [![coming_soon]][_ci]  |
-|  [MacOS-Latest]    |  Python 3.10  |  [![coming_soon]][_ci]  |
+|  [Ubuntu-Latest]   |  Python 3.12  |  [![ci]][_ci]           |
+|  [MacOS-Latest]    |  Python 3.10   |  [![coming_soon]][_ci]  |
 |  [MacOS-Latest]    |  Python 3.11  |  [![coming_soon]][_ci]  |
+|  [MacOS-Latest]    |  Python 3.12  |  [![coming_soon]][_ci]  |
 
 ### Current Release