From: Matti Picus Date: Mon, 4 May 2026 12:51:32 +0000 (+0300) Subject: limit pypy to one build, fix typo (#13275) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f88195d2d2d053e10ad9f59c4e396f404f77380;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git limit pypy to one build, fix typo (#13275) (cherry picked from commit f353f623271087bfe47f4b7271b35578046c59b5) Change-Id: I41ccb411b78d132cd5aa6c517d4583c85217d900 --- diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml index c9d09be0ce..dbe5851433 100644 --- a/.github/workflows/run-test.yaml +++ b/.github/workflows/run-test.yaml @@ -39,7 +39,6 @@ jobs: - "3.13" - "3.14" - "3.14t" - - "pypy-3.10" build-type: # builds greenlet, runs asyncio tests. includes aiosqlite driver - "cext-greenlet" @@ -55,8 +54,11 @@ jobs: include: # autocommit tests fail on the ci for some reason - - python-version: "pypy-3.10" + - python-version: "pypy-3.11" pytest-args: "-k 'not test_autocommit_on and not test_turn_autocommit_off_via_default_iso_level and not test_autocommit_isolation_level'" + architecture: x64 + build-type: "nocext" + os: "ubuntu-22.04" exclude: @@ -89,14 +91,6 @@ jobs: python-version: "3.8" - os: "macos-latest" python-version: "3.9" - # pypy does not have cext or x86 or arm on linux - - python-version: "pypy-3.10" - build-type: "cext" - - os: "ubuntu-22.04-arm" - python-version: "pypy-3.10" - - os: "windows-latest" - python-version: "pypy-3.10" - architecture: x86 # these combos are failing on CI, disabled for now - os: "windows-latest" python-version: "3.11" @@ -128,7 +122,7 @@ jobs: - name: Run tests run: nox -v -s github-${{ matrix.build-type }} -- ${{ matrix.pytest-args }} - continue-on-error: ${{ matrix.python-version == 'pypy-3.10' }} + continue-on-error: ${{ matrix.python-version == 'pypy-3.11' }} run-nox: name: ${{ matrix.nox-env }}-${{ matrix.python-version }} diff --git a/noxfile.py b/noxfile.py index b42e93fa74..ccda69e37a 100644 --- a/noxfile.py +++ b/noxfile.py @@ -193,7 +193,7 @@ def github_cext(session: nox.Session) -> None: def github_nocext(session: nox.Session) -> None: """run tests for github actions""" - _tests(session, "sqlite", "cext", greenlet=False) + _tests(session, "sqlite", "nocext", greenlet=False) def _tests(