From 5ce8ed758f808a5042898b0f11a1a9cd08616a54 Mon Sep 17 00:00:00 2001 From: Russell Martin Date: Mon, 13 Nov 2023 18:34:53 -0500 Subject: [PATCH 1/2] Remove Windows Store Python testing from CI - The underlying API to download this Python is no longer available to GitHub runners --- .github/workflows/ci.yml | 13 +------------ changes/1538.misc.rst | 1 + 2 files changed, 2 insertions(+), 12 deletions(-) create mode 100644 changes/1538.misc.rst diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 529fae190..0e57ad77d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,10 +50,6 @@ jobs: # Allow dev Python to fail without failing entire job #- python-version: "3.13-dev" # experimental: true - # Run tests against the latest Windows Store Python - - platform: "windows" - python-version: "winstore3.12" - experimental: false steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -61,17 +57,10 @@ jobs: fetch-depth: 0 - name: Set up Python - if: startswith(matrix.python-version, '3') uses: actions/setup-python@v4.7.1 with: python-version: ${{ matrix.python-version }} - - name: Install Windows Store Python - if: startswith(matrix.python-version, 'winstore') - uses: beeware/.github/.github/actions/install-win-store-python@main - with: - python-version: "3.12" - - name: Get Packages uses: actions/download-artifact@v3.0.2 with: @@ -103,7 +92,7 @@ jobs: id: coverage if: always() && contains('success,failure', steps.test.outcome) # coverage reporting must use the same Python version used to produce coverage - run: tox -qe coverage$(echo '${{ matrix.python-version }}' | tr -dc '0-9') + run: tox -qe coverage$(tr -d "." <<< "${{ matrix.python-version }}") coverage: name: Project coverage diff --git a/changes/1538.misc.rst b/changes/1538.misc.rst new file mode 100644 index 000000000..a1c698763 --- /dev/null +++ b/changes/1538.misc.rst @@ -0,0 +1 @@ +Windows Store Python can no longer be tested in CI and has been removed. From f05fb4fc1e9454861a8924575750507bd27ae152 Mon Sep 17 00:00:00 2001 From: Russell Martin Date: Mon, 13 Nov 2023 19:35:05 -0500 Subject: [PATCH 2/2] Ensure logic for tox coverage env name accommodates Python dev versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e57ad77d..01e7f43f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: id: coverage if: always() && contains('success,failure', steps.test.outcome) # coverage reporting must use the same Python version used to produce coverage - run: tox -qe coverage$(tr -d "." <<< "${{ matrix.python-version }}") + run: tox -qe coverage$(tr -dc "0-9" <<< "${{ matrix.python-version }}") coverage: name: Project coverage