From 323f657ced66dd8af78616a26bf15913cfdfe629 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Thu, 10 Oct 2024 20:09:24 -0700 Subject: [PATCH 1/4] rebase and fix for new agents --- .github/workflows/test.yml | 47 +++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ec8954bbe3e..69fa16a1cc1f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -94,16 +94,13 @@ jobs: os: macos-13 toxenv: py tox_extra_args: "-n 3 mypyc/test/test_run.py mypyc/test/test_external.py" - # This is broken. See - # - https://github.com/python/mypy/issues/17819 - # - https://github.com/python/mypy/pull/17822 - # - 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: mypyc runtime tests with py38-debug-build-ubuntu + python: '3.8' + debug_build: true + arch: x64 + os: ubuntu-latest + toxenv: py + tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py" - name: Type check our own code (py38-ubuntu) python: '3.8' @@ -142,15 +139,6 @@ jobs: steps: - 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, '-dev') }} run: | @@ -158,8 +146,8 @@ jobs: cd /tmp/cpython echo git rev-parse HEAD; git rev-parse HEAD git show --no-patch - sudo apt-get update - sudo apt-get install -y --no-install-recommends \ + sudo apt-get update -q + sudo apt-get install -q -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 ./configure --prefix=/opt/pythondev @@ -168,6 +156,23 @@ jobs: 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 + - name: Debug build + if: ${{ matrix.debug_build }} + run: | + git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch ${{ matrix.python }} + cd /tmp/cpython + echo git rev-parse HEAD; git rev-parse HEAD + git show --no-patch + sudo apt-get update -q + sudo apt-get install -q -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 + ./configure CFLAGS="-DPy_DEBUG -DPy_TRACE_REFS -DPYMALLOC_DEBUG" --with-pydebug -with-trace-refs --prefix=/opt/pythondev + 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')) }} with: From dbd15454925b7f4a28f8007091f5396d3816bb6e Mon Sep 17 00:00:00 2001 From: Shantanu Jain Date: Sun, 18 Jan 2026 14:26:59 -0800 Subject: [PATCH 2/4] . --- .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 b2fcae5f5578..389942a9bb85 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -94,8 +94,8 @@ jobs: # This is broken. See # - https://github.com/python/mypy/issues/17819 # - https://github.com/python/mypy/pull/17822 - - name: mypyc runtime tests with py39-debug-build-ubuntu - python: '3.9.21' + - name: mypyc runtime tests with py310-debug-build-ubuntu + python: '3.10' os: ubuntu-latest toxenv: py tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py" From d18b17baedbea8b3021077966c0098e5cdc13017 Mon Sep 17 00:00:00 2001 From: Shantanu Jain Date: Sun, 18 Jan 2026 14:36:06 -0800 Subject: [PATCH 3/4] next --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 05f9163121c1..527b77fe19bf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -22,7 +22,7 @@ identify==2.6.15 # via pre-commit iniconfig==2.1.0 # via pytest -librt==0.7.3 ; platform_python_implementation != "PyPy" +librt==0.7.8 ; platform_python_implementation != "PyPy" # via -r mypy-requirements.txt lxml==6.0.2 ; python_version < "3.15" # via -r test-requirements.in From 126205feef47e3ec7591497b78b222cd38d6a555 Mon Sep 17 00:00:00 2001 From: Shantanu Jain Date: Sun, 18 Jan 2026 14:42:12 -0800 Subject: [PATCH 4/4] not today --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 389942a9bb85..ee01763c3f8e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -94,12 +94,12 @@ jobs: # This is broken. See # - https://github.com/python/mypy/issues/17819 # - https://github.com/python/mypy/pull/17822 - - name: mypyc runtime tests with py310-debug-build-ubuntu - python: '3.10' - os: ubuntu-latest - toxenv: py - tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py" - debug_build: true + # - name: mypyc runtime tests with py310-debug-build-ubuntu + # python: '3.10' + # os: ubuntu-latest + # toxenv: py + # tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py" + # debug_build: true - name: Parallel tests with py314-ubuntu, interpreted python: '3.14'