From c001a8abc5b0201c22263ba4d91cb3001550f708 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 13:28:48 -0700
Subject: [PATCH 01/19] Test Python 3.13 against latest

---
 .github/workflows/test.yml | 42 +++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 01d5876635b0..f63e0a1e7e20 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -151,16 +151,44 @@ jobs:
     runs-on: ubuntu-latest
     name: Test suite with Python nightly
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.13-dev'
+      # - uses: actions/checkout@v3
+      # - uses: actions/setup-python@v4
+      # TODO try - uses: deadsnakes/action@v3.2.0
+      #   with:
+      #     python-version: '3.13-dev'
+
+      # Build Python from 3.13 branch
+      - name: Install build dependencies
+        run: sudo apt-get update && sudo apt-get install -y \
+          build-essential \
+          libssl-dev \
+          zlib1g-dev \
+          libncurses5-dev \
+          libncursesw5-dev \
+          libreadline-dev \
+          libsqlite3-dev \
+          libgdbm-dev \
+          libdb5.3-dev \
+          libbz2-dev \
+          libexpat1-dev \
+          liblzma-dev \
+          tk-dev \
+          libffi-dev \
+          liblzma-dev \
+          uuid-dev
+      - name: Compile Python from 3.13 branch
+        run: |
+          git clone --depth 1 --branch 3.13
+          cd cpython
+          ./configure
+          make -j 0
+          make install
       - name: Install tox
-        run: pip install setuptools==68.2.2 tox==4.11.0
+        run: python3.13 -m pip install setuptools==68.2.2 tox==4.11.0
       - name: Setup tox environment
-        run: tox run -e py --notest
+        run: python3.13 -m tox run -e py --notest
       - name: Test
-        run: tox run -e py --skip-pkg-install -- "-n 4"
+        run: python3.13 -m tox run -e py --skip-pkg-install -- "-n 4"
         continue-on-error: true
       - name: Mark as a success
         run: exit 0

From 5b5a3b272c5887173077a012e02ae0a81021a7e6 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 13:49:14 -0700
Subject: [PATCH 02/19] .

---
 .github/workflows/test.yml | 160 +++++--------------------------------
 1 file changed, 19 insertions(+), 141 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f63e0a1e7e20..c20fb202c122 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,130 +23,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  main:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        # Make sure to run mypyc compiled unit tests for both
-        # the oldest and newest supported Python versions
-        - name: Test suite with py38-ubuntu, mypyc-compiled
-          python: '3.8'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-          test_mypyc: true
-        - name: Test suite with py38-windows-64
-          python: '3.8'
-          arch: x64
-          os: windows-latest
-          toxenv: py38
-          tox_extra_args: "-n 4"
-        - name: Test suite with py39-ubuntu
-          python: '3.9'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-        - name: Test suite with py310-ubuntu
-          python: '3.10'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-        - name: Test suite with py311-ubuntu, mypyc-compiled
-          python: '3.11'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-          test_mypyc: true
-        - name: Test suite with py312-ubuntu, mypyc-compiled
-          python: '3.12'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-          test_mypyc: true
-
-        - name: mypyc runtime tests with py39-macos
-          python: '3.9.18'
-          arch: x64
-          # TODO: macos-13 is the last one to support Python 3.9, change it to macos-latest when updating the Python version
-          os: macos-13
-          toxenv: py
-          tox_extra_args: "-n 3 mypyc/test/test_run.py mypyc/test/test_external.py"
-        - name: mypyc runtime tests with py38-debug-build-ubuntu
-          python: '3.8.17'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py"
-          debug_build: true
-
-        - name: Type check our own code (py38-ubuntu)
-          python: '3.8'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: type
-        - name: Type check our own code (py38-windows-64)
-          python: '3.8'
-          arch: x64
-          os: windows-latest
-          toxenv: type
-
-          # We also run these checks with pre-commit in CI,
-          # but it's useful to run them with tox too,
-          # to ensure the tox env works as expected
-        - name: Formatting and code style with Black + ruff
-          python: '3.10'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: lint
-
-    name: ${{ matrix.name }}
-    env:
-      TOX_SKIP_MISSING_INTERPRETERS: False
-      # Rich (pip)
-      FORCE_COLOR: 1
-      # Tox
-      PY_COLORS: 1
-      # Mypy (see https://github.com/python/mypy/issues/7771)
-      TERM: xterm-color
-      MYPY_FORCE_COLOR: 1
-      MYPY_FORCE_TERMINAL_WIDTH: 200
-      # Pytest
-      PYTEST_ADDOPTS: --color=yes
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python }}
-        architecture: ${{ matrix.arch }}
-    - name: Debug build
-      if: ${{ matrix.debug_build }}
-      run: |
-        PYTHONVERSION=${{ matrix.python }}
-        PYTHONDIR=~/python-debug/python-$PYTHONVERSION
-        VENV=$PYTHONDIR/env
-        ./misc/build-debug-python.sh $PYTHONVERSION $PYTHONDIR $VENV
-        source $VENV/bin/activate
-    - name: Install tox
-      run: pip install setuptools==68.2.2 tox==4.11.0
-    - name: Compiled with mypyc
-      if: ${{ matrix.test_mypyc }}
-      run: |
-        pip install -r test-requirements.txt
-        CC=clang MYPYC_OPT_LEVEL=0 MYPY_USE_MYPYC=1 pip install -e .
-    - name: Setup tox environment
-      run: |
-        tox run -e ${{ matrix.toxenv }} --notest
-        python -c 'import os; print("os.cpu_count", os.cpu_count(), "os.sched_getaffinity", len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
-    - name: Test
-      run: tox run -e ${{ matrix.toxenv }} --skip-pkg-install -- ${{ matrix.tox_extra_args }}
-
   python-nightly:
     runs-on: ubuntu-latest
     name: Test suite with Python nightly
@@ -159,23 +35,25 @@ jobs:
 
       # Build Python from 3.13 branch
       - name: Install build dependencies
-        run: sudo apt-get update && sudo apt-get install -y \
-          build-essential \
-          libssl-dev \
-          zlib1g-dev \
-          libncurses5-dev \
-          libncursesw5-dev \
-          libreadline-dev \
-          libsqlite3-dev \
-          libgdbm-dev \
-          libdb5.3-dev \
-          libbz2-dev \
-          libexpat1-dev \
-          liblzma-dev \
-          tk-dev \
-          libffi-dev \
-          liblzma-dev \
-          uuid-dev
+        run: |
+          apt-get update
+          apt-get install -y --no-install-recommends \
+            build-essential \
+            gdb \
+            lcov \
+            libbz2-dev \
+            libffi-dev \
+            libgdbm-dev \
+            liblzma-dev \
+            libncurses5-dev \
+            libreadline6-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            lzma \
+            lzma-dev \
+            tk-dev \
+            uuid-dev \
+            zlib1g-dev
       - name: Compile Python from 3.13 branch
         run: |
           git clone --depth 1 --branch 3.13

From df845e77511288d90209626c50a833c59d2e7c8b Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 13:55:39 -0700
Subject: [PATCH 03/19] .

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c20fb202c122..ee52499d0c0e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,8 +36,8 @@ jobs:
       # Build Python from 3.13 branch
       - name: Install build dependencies
         run: |
-          apt-get update
-          apt-get install -y --no-install-recommends \
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
             build-essential \
             gdb \
             lcov \

From fde425be3cf224bbed1eae991c4375fb5617944a Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 14:03:31 -0700
Subject: [PATCH 04/19] .

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ee52499d0c0e..1ad90e289e5c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,7 +56,7 @@ jobs:
             zlib1g-dev
       - name: Compile Python from 3.13 branch
         run: |
-          git clone --depth 1 --branch 3.13
+          git clone --depth 1 --branch 3.13 https://github.com/python/cpython.git
           cd cpython
           ./configure
           make -j 0

From d4dabca78330eef0b6a727ef89a8364ec6fd9418 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 14:04:42 -0700
Subject: [PATCH 05/19] .

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1ad90e289e5c..0d6332bc42df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -59,7 +59,7 @@ jobs:
           git clone --depth 1 --branch 3.13 https://github.com/python/cpython.git
           cd cpython
           ./configure
-          make -j 0
+          make -j 4
           make install
       - name: Install tox
         run: python3.13 -m pip install setuptools==68.2.2 tox==4.11.0

From b92e1f72187bac3aee56828b8d4100779a2fdd59 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 14:06:49 -0700
Subject: [PATCH 06/19] .

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0d6332bc42df..fa565dad2ee3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,7 +60,7 @@ jobs:
           cd cpython
           ./configure
           make -j 4
-          make install
+          sudo make install
       - name: Install tox
         run: python3.13 -m pip install setuptools==68.2.2 tox==4.11.0
       - name: Setup tox environment

From aa71ad9d6dddde555c448638eae3dc489e8f3e88 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 14:23:52 -0700
Subject: [PATCH 07/19] checkout

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fa565dad2ee3..7db07d96326c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -61,6 +61,7 @@ jobs:
           ./configure
           make -j 4
           sudo make install
+      - uses: actions/checkout@v3
       - name: Install tox
         run: python3.13 -m pip install setuptools==68.2.2 tox==4.11.0
       - name: Setup tox environment

From c5344ac36c1ade6180bd3c83e5a0cbb64c3ac807 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 14:24:32 -0700
Subject: [PATCH 08/19] .

---
 .github/workflows/test.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7db07d96326c..a54d9d32dd07 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -61,6 +61,20 @@ jobs:
           ./configure
           make -j 4
           sudo make install
+      - name: which python
+        run: |
+          echo which python
+          which python
+          echo python --version
+          python --version
+          echo which python3
+          which python3
+          echo python3 --version
+          python3 --version
+          echo which python3.13
+          which python3.13
+          echo python3.13 --version
+          python3.13 --version
       - uses: actions/checkout@v3
       - name: Install tox
         run: python3.13 -m pip install setuptools==68.2.2 tox==4.11.0

From f6ff743f84b1aa2a6f855c8fb05797312a218872 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Mon, 23 Sep 2024 14:38:59 -0700
Subject: [PATCH 09/19] .

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a54d9d32dd07..831b18db97d6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,8 +56,8 @@ jobs:
             zlib1g-dev
       - name: Compile Python from 3.13 branch
         run: |
-          git clone --depth 1 --branch 3.13 https://github.com/python/cpython.git
-          cd cpython
+          git clone --depth 1 --branch 3.13 https://github.com/python/cpython.git /tmp/cpython
+          cd /tmp/cpython
           ./configure
           make -j 4
           sudo make install

From c855020e4cb4736209190496441114660330499e Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 13:57:29 -0700
Subject: [PATCH 10/19] .

---
 .github/workflows/test.yml | 212 +++++++++++++++++++++++++++----------
 1 file changed, 156 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 831b18db97d6..34df91df8904 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,68 +23,168 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  python-nightly:
-    runs-on: ubuntu-latest
-    name: Test suite with Python nightly
+  main:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        # Make sure to run mypyc compiled unit tests for both
+        # the oldest and newest supported Python versions
+        - name: Test suite with py38-ubuntu, mypyc-compiled
+          python: '3.8'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+          test_mypyc: true
+        - name: Test suite with py38-windows-64
+          python: '3.8'
+          arch: x64
+          os: windows-latest
+          toxenv: py38
+          tox_extra_args: "-n 4"
+        - name: Test suite with py39-ubuntu
+          python: '3.9'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+        - name: Test suite with py310-ubuntu
+          python: '3.10'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+        - name: Test suite with py311-ubuntu, mypyc-compiled
+          python: '3.11'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+          test_mypyc: true
+        - name: Test suite with py312-ubuntu, mypyc-compiled
+          python: '3.12'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+          test_mypyc: true
+
+        - name: Test suit with py313-dev-ubuntu, mypyc-compiled
+          python: '3.13-dev'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+          test_mypyc: true
+
+        - name: mypyc runtime tests with py39-macos
+          python: '3.9.18'
+          arch: x64
+          # TODO: macos-13 is the last one to support Python 3.9, change it to macos-latest when updating the Python version
+          os: macos-13
+          toxenv: py
+          tox_extra_args: "-n 3 mypyc/test/test_run.py mypyc/test/test_external.py"
+        - name: mypyc runtime tests with py38-debug-build-ubuntu
+          python: '3.8.17'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py"
+          debug_build: true
+
+        - name: Type check our own code (py38-ubuntu)
+          python: '3.8'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: type
+        - name: Type check our own code (py38-windows-64)
+          python: '3.8'
+          arch: x64
+          os: windows-latest
+          toxenv: type
+
+          # We also run these checks with pre-commit in CI,
+          # but it's useful to run them with tox too,
+          # to ensure the tox env works as expected
+        - name: Formatting and code style with Black + ruff
+          python: '3.10'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: lint
+
+    name: ${{ matrix.name }}
+    env:
+      TOX_SKIP_MISSING_INTERPRETERS: False
+      # Rich (pip)
+      FORCE_COLOR: 1
+      # Tox
+      PY_COLORS: 1
+      # Mypy (see https://github.com/python/mypy/issues/7771)
+      TERM: xterm-color
+      MYPY_FORCE_COLOR: 1
+      MYPY_FORCE_TERMINAL_WIDTH: 200
+      # Pytest
+      PYTEST_ADDOPTS: --color=yes
+
     steps:
-      # - uses: actions/checkout@v3
-      # - uses: actions/setup-python@v4
-      # TODO try - uses: deadsnakes/action@v3.2.0
-      #   with:
-      #     python-version: '3.13-dev'
-
-      # Build Python from 3.13 branch
-      - name: Install build dependencies
-        run: |
+    - uses: actions/checkout@v4
+
+    - name: Debug build
+      if: ${{ matrix.debug_build }}
+      run: |
+        PYTHONVERSION=${{ matrix.python }}
+        PYTHONDIR=~/python-debug/python-$PYTHONVERSION
+        VENV=$PYTHONDIR/env
+        ./misc/build-debug-python.sh $PYTHONVERSION $PYTHONDIR $VENV
+        # TODO: does this do anything? env vars aren't passed to the next step right
+        source $VENV/bin/activate
+    - name: Latest Dev build
+      if: ${{ endsWith(matrix.python-version, '-dev') }}
+      run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends \
-            build-essential \
-            gdb \
-            lcov \
-            libbz2-dev \
-            libffi-dev \
-            libgdbm-dev \
-            liblzma-dev \
-            libncurses5-dev \
-            libreadline6-dev \
-            libsqlite3-dev \
-            libssl-dev \
-            lzma \
-            lzma-dev \
-            tk-dev \
-            uuid-dev \
-            zlib1g-dev
-      - name: Compile Python from 3.13 branch
-        run: |
-          git clone --depth 1 --branch 3.13 https://github.com/python/cpython.git /tmp/cpython
+            build-essential gdb lcov libbz2-dev libffi-dev libgdbm-dev liblzma-dev libncurses5-dev \
+            libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
+          git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch $( echo ${{ matrix.python-version }} | sed 's/-dev//' )
           cd /tmp/cpython
+          git show
           ./configure
-          make -j 4
+          make -j$(nproc)
           sudo make install
-      - name: which python
-        run: |
-          echo which python
-          which python
-          echo python --version
-          python --version
-          echo which python3
-          which python3
-          echo python3 --version
-          python3 --version
-          echo which python3.13
-          which python3.13
-          echo python3.13 --version
-          python3.13 --version
-      - uses: actions/checkout@v3
-      - name: Install tox
-        run: python3.13 -m pip install setuptools==68.2.2 tox==4.11.0
-      - name: Setup tox environment
-        run: python3.13 -m tox run -e py --notest
-      - name: Test
-        run: python3.13 -m tox run -e py --skip-pkg-install -- "-n 4"
-        continue-on-error: true
-      - name: Mark as a success
-        run: exit 0
+    - uses: actions/setup-python@v5
+      if: ${{ !(matrix.debug_build || endsWith(matrix.python-version, '-dev')) }}
+      with:
+        python-version: ${{ matrix.python }}
+        architecture: ${{ matrix.arch }}
+
+    - name: Install tox
+      run: |
+        echo which python; which python
+        echo which pip; which pip
+        echo python version; python -c 'import sys; print(sys.version)'
+        echo debug build; python -c 'import sysconfig; print(bool(sysconfig.get_config_var("Py_DEBUG")))'
+        echo os.cpu_count; python -c 'import os; print(os.cpu_count())'
+        echo os.sched_getaffinity; python -c 'import os; print("os.sched_getaffinity", len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
+        pip install setuptools==68.2.2 tox==4.11.0
+
+    - name: Compiled with mypyc
+      if: ${{ matrix.test_mypyc }}
+      run: |
+        pip install -r test-requirements.txt
+        CC=clang MYPYC_OPT_LEVEL=0 MYPY_USE_MYPYC=1 pip install -e .
+
+    - name: Setup tox environment
+      run: |
+        tox run -e ${{ matrix.toxenv }} --notes
+    - name: Test
+      run: tox run -e ${{ matrix.toxenv }} --skip-pkg-install -- ${{ matrix.tox_extra_args }}
+      continue-on-error: ${{ matrix.allow_failure == 'true' }}
+
+    - name: Mark as success (check failures manually)
+      if: ${{ matrix.allow_failure == 'true' }}
+      run: exit 0
 
   python_32bits:
     runs-on: ubuntu-latest

From 40d4a8cba9119e0e02e238153649228335c39509 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 15:01:48 -0700
Subject: [PATCH 11/19] .

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 34df91df8904..22ce678376d8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -141,20 +141,20 @@ jobs:
         # TODO: does this do anything? env vars aren't passed to the next step right
         source $VENV/bin/activate
     - name: Latest Dev build
-      if: ${{ endsWith(matrix.python-version, '-dev') }}
+      if: ${{ endsWith(matrix.python, '-dev') }}
       run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends \
             build-essential gdb lcov libbz2-dev libffi-dev libgdbm-dev liblzma-dev libncurses5-dev \
             libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
-          git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch $( echo ${{ matrix.python-version }} | sed 's/-dev//' )
+          git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch $( echo ${{ matrix.python }} | sed 's/-dev//' )
           cd /tmp/cpython
           git show
           ./configure
           make -j$(nproc)
           sudo make install
     - uses: actions/setup-python@v5
-      if: ${{ !(matrix.debug_build || endsWith(matrix.python-version, '-dev')) }}
+      if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.arch }}

From b89af1423af480ce9ac62f61f42f2759f31c9bfd Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 16:16:32 -0700
Subject: [PATCH 12/19] .

---
 .github/workflows/test.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 22ce678376d8..4e619103a99f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -149,10 +149,12 @@ jobs:
             libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
           git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch $( echo ${{ matrix.python }} | sed 's/-dev//' )
           cd /tmp/cpython
-          git show
-          ./configure
+          echo git rev-parse HEAD; git rev-parse HEAD
+          git show --no-patch
+          ./configure --prefix=/opt/pythondev
           make -j$(nproc)
           sudo make install
+          echo "/opt/pythondev/bin" >> $GITHUB_PATH
     - uses: actions/setup-python@v5
       if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}
       with:

From 3c55aa65f1b1ec192b838e7e79ececf8d831bf28 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 22:33:17 -0700
Subject: [PATCH 13/19] .

---
 .github/workflows/test.yml | 78 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4e619103a99f..fee9aa928f32 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,45 +31,45 @@ jobs:
         include:
         # Make sure to run mypyc compiled unit tests for both
         # the oldest and newest supported Python versions
-        - name: Test suite with py38-ubuntu, mypyc-compiled
-          python: '3.8'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-          test_mypyc: true
-        - name: Test suite with py38-windows-64
-          python: '3.8'
-          arch: x64
-          os: windows-latest
-          toxenv: py38
-          tox_extra_args: "-n 4"
-        - name: Test suite with py39-ubuntu
-          python: '3.9'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-        - name: Test suite with py310-ubuntu
-          python: '3.10'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-        - name: Test suite with py311-ubuntu, mypyc-compiled
-          python: '3.11'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-          test_mypyc: true
-        - name: Test suite with py312-ubuntu, mypyc-compiled
-          python: '3.12'
-          arch: x64
-          os: ubuntu-latest
-          toxenv: py
-          tox_extra_args: "-n 4"
-          test_mypyc: true
+        # - name: Test suite with py38-ubuntu, mypyc-compiled
+        #   python: '3.8'
+        #   arch: x64
+        #   os: ubuntu-latest
+        #   toxenv: py
+        #   tox_extra_args: "-n 4"
+        #   test_mypyc: true
+        # - name: Test suite with py38-windows-64
+        #   python: '3.8'
+        #   arch: x64
+        #   os: windows-latest
+        #   toxenv: py38
+        #   tox_extra_args: "-n 4"
+        # - name: Test suite with py39-ubuntu
+        #   python: '3.9'
+        #   arch: x64
+        #   os: ubuntu-latest
+        #   toxenv: py
+        #   tox_extra_args: "-n 4"
+        # - name: Test suite with py310-ubuntu
+        #   python: '3.10'
+        #   arch: x64
+        #   os: ubuntu-latest
+        #   toxenv: py
+        #   tox_extra_args: "-n 4"
+        # - name: Test suite with py311-ubuntu, mypyc-compiled
+        #   python: '3.11'
+        #   arch: x64
+        #   os: ubuntu-latest
+        #   toxenv: py
+        #   tox_extra_args: "-n 4"
+        #   test_mypyc: true
+        # - name: Test suite with py312-ubuntu, mypyc-compiled
+        #   python: '3.12'
+        #   arch: x64
+        #   os: ubuntu-latest
+        #   toxenv: py
+        #   tox_extra_args: "-n 4"
+        #   test_mypyc: true
 
         - name: Test suit with py313-dev-ubuntu, mypyc-compiled
           python: '3.13-dev'

From 4e74d68670286fe083dff4ebe3f53f0c683105ef Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 22:33:19 -0700
Subject: [PATCH 14/19] .

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fee9aa928f32..762804ae1140 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -163,6 +163,8 @@ jobs:
 
     - name: Install tox
       run: |
+        echo ls /opt/pythondev/bin; ls /opt/pythondev/bin
+        echo PATH; echo $PATH
         echo which python; which python
         echo which pip; which pip
         echo python version; python -c 'import sys; print(sys.version)'

From a148897709c709119c839e34f94e2c0e9ca833d9 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 22:36:33 -0700
Subject: [PATCH 15/19] .

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 762804ae1140..0acce967373a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -154,6 +154,7 @@ jobs:
           ./configure --prefix=/opt/pythondev
           make -j$(nproc)
           sudo make install
+          ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
           echo "/opt/pythondev/bin" >> $GITHUB_PATH
     - uses: actions/setup-python@v5
       if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}

From aa0af19ad6672dc175d272d855c9101591d2eb92 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 22:38:38 -0700
Subject: [PATCH 16/19] .

---
 .github/workflows/test.yml | 81 +++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0acce967373a..0e678900de6f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,45 +31,45 @@ jobs:
         include:
         # Make sure to run mypyc compiled unit tests for both
         # the oldest and newest supported Python versions
-        # - name: Test suite with py38-ubuntu, mypyc-compiled
-        #   python: '3.8'
-        #   arch: x64
-        #   os: ubuntu-latest
-        #   toxenv: py
-        #   tox_extra_args: "-n 4"
-        #   test_mypyc: true
-        # - name: Test suite with py38-windows-64
-        #   python: '3.8'
-        #   arch: x64
-        #   os: windows-latest
-        #   toxenv: py38
-        #   tox_extra_args: "-n 4"
-        # - name: Test suite with py39-ubuntu
-        #   python: '3.9'
-        #   arch: x64
-        #   os: ubuntu-latest
-        #   toxenv: py
-        #   tox_extra_args: "-n 4"
-        # - name: Test suite with py310-ubuntu
-        #   python: '3.10'
-        #   arch: x64
-        #   os: ubuntu-latest
-        #   toxenv: py
-        #   tox_extra_args: "-n 4"
-        # - name: Test suite with py311-ubuntu, mypyc-compiled
-        #   python: '3.11'
-        #   arch: x64
-        #   os: ubuntu-latest
-        #   toxenv: py
-        #   tox_extra_args: "-n 4"
-        #   test_mypyc: true
-        # - name: Test suite with py312-ubuntu, mypyc-compiled
-        #   python: '3.12'
-        #   arch: x64
-        #   os: ubuntu-latest
-        #   toxenv: py
-        #   tox_extra_args: "-n 4"
-        #   test_mypyc: true
+        - name: Test suite with py38-ubuntu, mypyc-compiled
+          python: '3.8'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+          test_mypyc: true
+        - name: Test suite with py38-windows-64
+          python: '3.8'
+          arch: x64
+          os: windows-latest
+          toxenv: py38
+          tox_extra_args: "-n 4"
+        - name: Test suite with py39-ubuntu
+          python: '3.9'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+        - name: Test suite with py310-ubuntu
+          python: '3.10'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+        - name: Test suite with py311-ubuntu, mypyc-compiled
+          python: '3.11'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+          test_mypyc: true
+        - name: Test suite with py312-ubuntu, mypyc-compiled
+          python: '3.12'
+          arch: x64
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
+          test_mypyc: true
 
         - name: Test suit with py313-dev-ubuntu, mypyc-compiled
           python: '3.13-dev'
@@ -164,14 +164,13 @@ jobs:
 
     - name: Install tox
       run: |
-        echo ls /opt/pythondev/bin; ls /opt/pythondev/bin
         echo PATH; echo $PATH
         echo which python; which python
         echo which pip; which pip
         echo python version; python -c 'import sys; print(sys.version)'
         echo debug build; python -c 'import sysconfig; print(bool(sysconfig.get_config_var("Py_DEBUG")))'
         echo os.cpu_count; python -c 'import os; print(os.cpu_count())'
-        echo os.sched_getaffinity; python -c 'import os; print("os.sched_getaffinity", len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
+        echo os.sched_getaffinity; python -c 'import os; print(len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
         pip install setuptools==68.2.2 tox==4.11.0
 
     - name: Compiled with mypyc

From 3248a0c3e71d1da2724663245e26126d328004c4 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 22:39:44 -0700
Subject: [PATCH 17/19] .

---
 .github/workflows/test.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0e678900de6f..2bd71c082ed8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,6 +78,14 @@ jobs:
           toxenv: py
           tox_extra_args: "-n 4"
           test_mypyc: true
+        # - name: Test suit with py314-dev-ubuntu
+        #   python: '3.14-dev'
+        #   arch: x64
+        #   os: ubuntu-latest
+        #   toxenv: py
+        #   tox_extra_args: "-n 4"
+        #   allow_failure: true
+        #   test_mypyc: true
 
         - name: mypyc runtime tests with py39-macos
           python: '3.9.18'

From 01e0ab2069c88a4fe3b836e88cb26e3575f24c10 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 22:41:11 -0700
Subject: [PATCH 18/19] .

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2bd71c082ed8..be2932b5b1e6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -162,7 +162,7 @@ jobs:
           ./configure --prefix=/opt/pythondev
           make -j$(nproc)
           sudo make install
-          ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
+          sudo ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
           echo "/opt/pythondev/bin" >> $GITHUB_PATH
     - uses: actions/setup-python@v5
       if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}

From 89c6b7bb2bec5e2dd33ba1755c747620e92350a7 Mon Sep 17 00:00:00 2001
From: Shantanu Jain <hauntsaninja@gmail.com>
Date: Tue, 24 Sep 2024 23:44:58 -0700
Subject: [PATCH 19/19] .

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index be2932b5b1e6..6e29feef7b00 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -163,6 +163,7 @@ jobs:
           make -j$(nproc)
           sudo make install
           sudo ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
+          sudo ln -s /opt/pythondev/bin/pip3 /opt/pythondev/bin/pip
           echo "/opt/pythondev/bin" >> $GITHUB_PATH
     - uses: actions/setup-python@v5
       if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}