Skip to content

Commit 1df5329

Browse files
committed
Fix windows testing
1 parent 76ea04a commit 1df5329

File tree

1 file changed

+7
-27
lines changed

1 file changed

+7
-27
lines changed

.github/workflows/tests.yml

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -70,35 +70,15 @@ jobs:
7070
pip install uv
7171
uv pip install --system -r pyproject.toml --extra test
7272
73-
- name: Build module and run tests
74-
if: matrix.os != 'windows-latest'
73+
- name: Build module
7574
run: |
7675
python setup.py build_ext --inplace
77-
pytest -xvs -n0
7876
79-
- name: Build wheel and run tests
77+
- name: Fix windows gsl dlls
8078
if: matrix.os == 'windows-latest'
81-
shell: powershell
8279
run: |
83-
uv pip install --system build delvewheel
84-
python -m build --wheel
85-
$vcpkgRoot = $env:VCPKG_INSTALLATION_ROOT
86-
if (-not $vcpkgRoot) { $vcpkgRoot = 'C:\vcpkg' }
87-
$gslBinPath = Join-Path $vcpkgRoot 'installed\x64-windows\bin'
88-
# Ensure GSL bin is on PATH for this session
89-
$env:PATH = "$gslBinPath;$env:PATH"
90-
# Repair wheel(s) to bundle DLLs
91-
$whls = Get-ChildItem -Path dist -Filter '*.whl'
92-
if ($whls) {
93-
foreach ($w in $whls) {
94-
delvewheel repair $w.FullName -w dist --add-path $gslBinPath
95-
}
96-
} else {
97-
Write-Error 'No wheel files found in dist/'
98-
exit 1
99-
}
100-
# Remove source package directory to ensure pip installs wheel
101-
if (Test-Path msprime) { Remove-Item -Recurse -Force msprime }
102-
# Install repaired wheel(s)
103-
Get-ChildItem -Path dist -Filter '*.whl' | ForEach-Object { pip install $_.FullName }
104-
pytest -xvs -n0
80+
cp /c/vcpkg/installed/x64-windows/bin/gsl*.dll msprime/
81+
82+
- name: Run tests
83+
run: |
84+
pytest -xvs -n0

0 commit comments

Comments
 (0)