From be5fdf73d71ddaf80fcfcb74ce24e166d8e0c07e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 11 Jan 2023 21:53:49 +0200 Subject: [PATCH 1/4] Refactor: PyPy into matrix with others on ubuntu-latest --- .github/workflows/main.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dc2a0fca..d6cb7f3d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,15 +19,9 @@ jobs: matrix: # Test all supported versions on Ubuntu: os: [ubuntu-latest] - python: ["3.7", "3.8", "3.9", "3.10", 3.11-dev, 3.12-dev] + python: [pypy3.7, pypy3.8, pypy3.9, "3.7", "3.8", "3.9", "3.10", 3.11-dev, 3.12-dev] include: - # Also test PyPy, macOS, and Windows: - - os: ubuntu-latest - python: pypy-3.9 - - os: ubuntu-latest - python: pypy-3.8 - - os: ubuntu-latest - python: pypy-3.7 + # Also test macOS and Windows: - os: macos-latest python: "3.10" - os: windows-latest From 8e43134451263c915b5fa068a82c5630fd883911 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 11 Jan 2023 21:25:27 +0200 Subject: [PATCH 2/4] Bump GitHub Actions --- .github/workflows/main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6cb7f3d..98629825 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,12 +2,11 @@ name: test on: push: - branches: [main] pull_request: - branches: [main] schedule: # Midnight UTC: - cron: "0 0 * * *" + workflow_dispatch: jobs: @@ -27,14 +26,14 @@ jobs: - os: windows-latest python: "3.10" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: "!endsWith(matrix.python, '-dev')" with: python-version: ${{ matrix.python }} - name: Set up Python ${{ matrix.python }} using deadsnakes - uses: deadsnakes/action@v2.1.1 + uses: deadsnakes/action@v3.0.0 if: "endsWith(matrix.python, '-dev')" with: python-version: ${{ matrix.python }} From fcaf941ea74eb6b846a21037e94460dee848e7b4 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 15 Jan 2023 17:21:45 +0200 Subject: [PATCH 3/4] Skip 3.12-dev pending Greenlet support --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 98629825..af4d343d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,8 @@ jobs: matrix: # Test all supported versions on Ubuntu: os: [ubuntu-latest] - python: [pypy3.7, pypy3.8, pypy3.9, "3.7", "3.8", "3.9", "3.10", 3.11-dev, 3.12-dev] + # Skip 3.12-dev, pending https://github.com/python-greenlet/greenlet/issues/323 + python: [pypy3.7, pypy3.8, pypy3.9, "3.7", "3.8", "3.9", "3.10", 3.11-dev] include: # Also test macOS and Windows: - os: macos-latest From 23663dfba06133f02647adddb1afdd41f3d009d5 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 15 Jan 2023 17:23:04 +0200 Subject: [PATCH 4/4] Remove unsupported pypy3.7 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af4d343d..c1bae57d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: # Test all supported versions on Ubuntu: os: [ubuntu-latest] # Skip 3.12-dev, pending https://github.com/python-greenlet/greenlet/issues/323 - python: [pypy3.7, pypy3.8, pypy3.9, "3.7", "3.8", "3.9", "3.10", 3.11-dev] + python: [pypy3.8, pypy3.9, "3.7", "3.8", "3.9", "3.10", 3.11-dev] include: # Also test macOS and Windows: - os: macos-latest