From c4f3d61b1134ac1d11732d33f6c8e163a30876e5 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 15 Jul 2022 12:25:57 +0200 Subject: [PATCH 1/3] Upgrade GitHub Actions --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 025eada2..5035ee22 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,8 +12,8 @@ jobs: name: run tests from packaged source runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: "3.10" - name: test @@ -48,8 +48,8 @@ jobs: name: "python=${{ matrix.python-version }} os=${{ matrix.os }}" runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: install tox From 9157939067944c0cb54067096cd427c9463ee07e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 15 Jul 2022 19:34:57 +0200 Subject: [PATCH 2/3] Bring in changes from #526 --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5035ee22..b6cef829 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: 3.x - name: test run: | python setup.py sdist @@ -35,7 +35,7 @@ jobs: # any additional builds for windows and macos # handled via `include` to avoid an over-large test matrix os: [ubuntu-latest] - python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11-dev", "pypy-2.7", "pypy-3.7"] + python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11-dev", "pypy-2.7", "pypy-3.8"] include: - os: windows-latest python-version: "2.7" From ceeb88c26a1865f4efa889950c0a7b37c313c46a Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 15 Jul 2022 19:36:36 +0200 Subject: [PATCH 3/3] Also upgrade test-on-downstream-projects.yaml --- .github/workflows/test-on-downstream-projects.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-on-downstream-projects.yaml b/.github/workflows/test-on-downstream-projects.yaml index 90c63a96..17ae4dac 100644 --- a/.github/workflows/test-on-downstream-projects.yaml +++ b/.github/workflows/test-on-downstream-projects.yaml @@ -14,13 +14,15 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: 3.x - run: python -m pip install tox - name: build run: make build - name: upload latest builds - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: latest-build path: dist/* @@ -34,13 +36,13 @@ jobs: steps: - run: git clone "https://gitlab.com/mailman/mailman/" . - name: download sdist build - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: latest-build path: nose2-build - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: 3.x - run: python -m pip install tox - name: setup testenv run: tox -e py-nocov --devenv testenv