From e60c9e56003106e0aca6654f706357db615ff03a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Br=C3=A9nainn=20Woodsend?= <bwoodsend@gmail.com>
Date: Sun, 24 Dec 2023 00:02:31 +0000
Subject: [PATCH] Bump CI Python versions

---
 .github/workflows/test.yml            | 33 ++++++++++-----------------
 tests/PyInstaller_/frozen-pytest.spec |  7 ++++--
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 287e469..cdc82a1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,18 +9,17 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.9, 3.6, 3.7, 3.8, '3.10']
+        python-version: [3.8, '3.10', 3.12]
         architecture: ['x64']
         include:
-          - os: macos-10.15
-            python-version: 3.9
+          - os: ubuntu-20.04
+            python-version: 3.6
             architecture: 'x64'
-          - os: macos-11.0
-            python-version: 3.9
+          - os: macos-latest
+            python-version: 3.12
             architecture: 'x64'
-          - name: Windows
-            os: windows-latest
-            python-version: 3.9
+          - os: windows-latest
+            python-version: 3.12
             architecture: 'x64'
 
       fail-fast: false
@@ -31,8 +30,6 @@ jobs:
     steps:
 
       - uses: actions/checkout@v3
-      - run: |
-          git fetch --prune --unshallow
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v3
@@ -40,19 +37,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.architecture }}
 
-      - name: Cache pip cached wheels
-        uses: actions/cache@v3
-        env:
-          cache-name: ${{ matrix.os }}
-        with:
-          path: pip-cache
-          key: ${{ matrix.os }}
-          restore-keys: ${{ matrix.os }}
-
       - name: Install
         run: |
-          pip install --cache-dir=pip-cache wheel
-          pip install --cache-dir=pip-cache -e .[test]
+          pip install wheel toml setuptools
+          pip install -e .[test]
 
       - name: Build
         run: python setup.py build
@@ -61,8 +49,11 @@ jobs:
 
       - name: Test
         run: pytest
+        env:
+          FORCE_COLOR: 1
 
       # Test PyInstaller.
+      - run: pip uninstall -y hirola && pip install .
       - run: pip install pyinstaller
       - working-directory: tests/PyInstaller_
         run: pyinstaller frozen-pytest.spec
diff --git a/tests/PyInstaller_/frozen-pytest.spec b/tests/PyInstaller_/frozen-pytest.spec
index fa797df..ad91645 100644
--- a/tests/PyInstaller_/frozen-pytest.spec
+++ b/tests/PyInstaller_/frozen-pytest.spec
@@ -1,6 +1,6 @@
 # -*- mode: python ; coding: utf-8 -*-
 
-block_cipher = None
+import sys
 
 from PyInstaller.utils.hooks import collect_entry_point
 
@@ -10,7 +10,10 @@ datas, hiddenimports = collect_entry_point("pytest11")
 # Collect modules imported by the test suite but not hirola itself.
 hiddenimports += ["statistics"]
 
+if sys.version_info < (3, 8):
+  hiddenimports += ["py._path"]
+
 a = Analysis(['frozen-pytest.py'], datas=datas, hiddenimports=hiddenimports)
-pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data)
 exe = EXE(pyz, a.scripts, [], exclude_binaries=True, name='frozen-pytest')
 coll = COLLECT(exe, a.binaries, a.zipfiles, a.datas, name='frozen-pytest')