Skip to content

Commit 54868a4

Browse files
authored
Merge pull request #26 from openscm/hotfix-test-pypi-install
Hot fix test PyPI install
2 parents e3d62f8 + 147e604 commit 54868a4

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/install-pypi.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ jobs:
6767
# (see https://github.com/fortran-lang/setup-fortran)
6868
compiler: "gcc"
6969
compiler-version: "13"
70+
exclude:
71+
- os: windows-11-arm
72+
python-version: 3.9
73+
- os: windows-11-arm
74+
python-version: 3.10
7075

7176
steps:
7277
- name: Set up Python "${{ matrix.python-version }}"
@@ -87,21 +92,21 @@ jobs:
8792
pip install --upgrade pip wheel
8893
pip install "${{ matrix.install-target }}" ${{ matrix.pip-install-flags }}
8994
- name: Check no warnings
90-
if: matrix.os != 'windows-latest'
95+
if: ${{ !(startsWith(matrix.os, 'windows')) }}
9196
run: |
9297
# Install and save stderr to file so we can check for missing target errors
9398
# (re-install is a bit stupid,
9499
# but it doesn't actually do anything except emit the warning in practice)
95100
pip install "${{ matrix.install-target }}" 2>stderr.txt
96101
if grep -q "WARN" stderr.txt; then echo "Warnings in pip install output" && cat stderr.txt && exit 1; else exit 0; fi
97102
- name: Get version non-windows
98-
if: matrix.os != 'windows-latest'
103+
if: ${{ !(startsWith(matrix.os, 'windows')) }}
99104
run: |
100105
INSTALLED_VERSION=`python -c 'import example_fgen_basic; print(f"v{example_fgen_basic.__version__}")'`
101106
echo $INSTALLED_VERSION
102107
echo "INSTALLED_VERSION=$INSTALLED_VERSION" >> $GITHUB_ENV
103108
- name: Get version windows
104-
if: matrix.os == 'windows-latest'
109+
if: ${{ startsWith(matrix.os, 'windows') }}
105110
run: |
106111
chcp 65001 # use utf-8
107112
python -c 'import example_fgen_basic; f = open("version.txt", "w"); f.write(f"INSTALLED_VERSION=v{example_fgen_basic.__version__}"); f.close()'

changelog/26.trivial.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed up test PyPI installation for windows ARM

0 commit comments

Comments
 (0)