From c1e8291472a995cb5b89e999f4bb42e18daa7f8d Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Wed, 27 Aug 2025 13:27:19 +0200 Subject: [PATCH 1/2] Update workflow --- .github/workflows/install-pypi.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/install-pypi.yaml b/.github/workflows/install-pypi.yaml index 91d8211..8cf9e9c 100644 --- a/.github/workflows/install-pypi.yaml +++ b/.github/workflows/install-pypi.yaml @@ -67,6 +67,11 @@ jobs: # (see https://github.com/fortran-lang/setup-fortran) compiler: "gcc" compiler-version: "13" + exclude: + - os: windows-11-arm + python-version: 3.9 + - os: windows-11-arm + python-version: 3.10 steps: - name: Set up Python "${{ matrix.python-version }}" @@ -87,7 +92,7 @@ jobs: pip install --upgrade pip wheel pip install "${{ matrix.install-target }}" ${{ matrix.pip-install-flags }} - name: Check no warnings - if: matrix.os != 'windows-latest' + if: ${{ !(startsWith(matrix.os, 'windows')) }} run: | # Install and save stderr to file so we can check for missing target errors # (re-install is a bit stupid, @@ -95,13 +100,13 @@ jobs: pip install "${{ matrix.install-target }}" 2>stderr.txt if grep -q "WARN" stderr.txt; then echo "Warnings in pip install output" && cat stderr.txt && exit 1; else exit 0; fi - name: Get version non-windows - if: matrix.os != 'windows-latest' + if: ${{ !(startsWith(matrix.os, 'windows')) }} run: | INSTALLED_VERSION=`python -c 'import example_fgen_basic; print(f"v{example_fgen_basic.__version__}")'` echo $INSTALLED_VERSION echo "INSTALLED_VERSION=$INSTALLED_VERSION" >> $GITHUB_ENV - name: Get version windows - if: matrix.os == 'windows-latest' + if: ${{ startsWith(matrix.os, 'windows') }} run: | chcp 65001 # use utf-8 python -c 'import example_fgen_basic; f = open("version.txt", "w"); f.write(f"INSTALLED_VERSION=v{example_fgen_basic.__version__}"); f.close()' From 147e604581c5fba95241dbeee8cfbc4f23c1b608 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Wed, 27 Aug 2025 13:30:32 +0200 Subject: [PATCH 2/2] CHANGELOG --- changelog/26.trivial.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/26.trivial.md diff --git a/changelog/26.trivial.md b/changelog/26.trivial.md new file mode 100644 index 0000000..1c1704d --- /dev/null +++ b/changelog/26.trivial.md @@ -0,0 +1 @@ +Fixed up test PyPI installation for windows ARM