From 0b243bcf90e4c9c3a4fdc9851b96c4236dcacd1b Mon Sep 17 00:00:00 2001
From: zvecr <git@zvecr.com>
Date: Mon, 24 Jun 2024 05:03:13 +0100
Subject: [PATCH] Bump minimum Python version to 3.9

---
 .github/workflows/cli_setup.yml        | 12 ++++++++----
 .github/workflows/docker-republish.yml |  2 +-
 .github/workflows/python-publish.yml   |  2 +-
 qmk_cli/script_qmk.py                  |  4 ++--
 setup.cfg                              |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cli_setup.yml b/.github/workflows/cli_setup.yml
index 5a6529c..ae97057 100644
--- a/.github/workflows/cli_setup.yml
+++ b/.github/workflows/cli_setup.yml
@@ -32,7 +32,10 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        include:
+          - os: macos-13
+            python-version: '3.9'
 
     steps:
     - uses: actions/checkout@v4
@@ -59,16 +62,17 @@ jobs:
       uses: msys2/setup-msys2@v2
       with:
         update: true
-        install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-pillow mingw-w64-x86_64-rust
+        install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-build mingw-w64-x86_64-python-pillow mingw-w64-x86_64-rust
 
+    # Upgrade pip due to msys packaging + pypa/build/pull/736 issues
     - name: (MSYS2) Install Python dependencies
       shell: msys2 {0}
       run: |
-        python3 -m pip install -U setuptools wheel
+        python3 -m pip install --upgrade pip
+
     - name: (MSYS2) Install QMK CLI from source
       shell: msys2 {0}
       run: |
-        python3 -m pip install -U build
         python3 -m build
         python3 -m pip install dist/qmk-*.tar.gz
     - name: (MSYS2) Run qmk setup -y
diff --git a/.github/workflows/docker-republish.yml b/.github/workflows/docker-republish.yml
index fda11f6..56c32ee 100644
--- a/.github/workflows/docker-republish.yml
+++ b/.github/workflows/docker-republish.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.9'
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 4b27043..a40caef 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.9'
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
diff --git a/qmk_cli/script_qmk.py b/qmk_cli/script_qmk.py
index 7d68f76..ecc15f2 100644
--- a/qmk_cli/script_qmk.py
+++ b/qmk_cli/script_qmk.py
@@ -46,9 +46,9 @@ def main():
     """Setup the environment before dispatching to the entrypoint.
     """
     # Warn if they use an outdated python version
-    if sys.version_info < (3, 7):
+    if sys.version_info < (3, 9):
         print('Warning: Your Python version is out of date! Some subcommands may not work!')
-        print('Please upgrade to Python 3.7 or later.')
+        print('Please upgrade to Python 3.9 or later.')
 
     if 'windows' in platform().lower():
         msystem = os.environ.get('MSYSTEM', '')
diff --git a/setup.cfg b/setup.cfg
index b42e0bb..dedc709 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -48,7 +48,7 @@ install_requires =
 	pygments
 	pyserial
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.9
 
 [options.entry_points]
 console_scripts =