Skip to content

Commit a8f2848

Browse files
authored
Merge pull request #64589 from qgis/m-kuhn-patch-3
[vcpkg] Add scipy
2 parents 7ad62da + 247edaa commit a8f2848

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/build-macos-qt6.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
strategy:
2020
matrix:
2121
include:
22-
- os: macos-14
22+
- os: macos-15-intel
2323
triplet: x64-osx-dynamic-release
2424
deployment-target: "10.15"
2525
osx-architecture: "x86_64"
26-
- os: macos-14
26+
- os: macos-15
2727
triplet: arm64-osx-dynamic-release
2828
deployment-target: "11.0"
2929
osx-architecture: "arm64"
@@ -60,23 +60,21 @@ jobs:
6060
echo $(brew --prefix libtool)/bin >> $GITHUB_PATH
6161
6262
- name: Symlink gfortran (macOS)
63-
if: matrix.os == 'macos-14'
63+
if: matrix.os == 'macos-15'
6464
run: |
6565
# make sure gfortran is available
66-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
66+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
6767
# https://github.com/actions/runner-images/issues/3371
68-
# ln version - new path 'MacOS14'
6968
sudo ln -fs /opt/homebrew/bin/gfortran-${GCC_VERSION} /usr/local/bin/gfortran
7069
sudo mkdir -p /usr/local/gfortran
7170
sudo ln -sf /opt/homebrew/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib
7271
7372
- name: Symlink gfortran (macOS-intel)
74-
if: matrix.os == 'macos-14-intel'
73+
if: matrix.os == 'macos-15-intel'
7574
run: |
7675
# make sure gfortran is available
77-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
76+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
7877
# https://github.com/actions/runner-images/issues/3371
79-
# ln version - new path 'MacOS14'
8078
sudo ln -fs /usr/local/bin/gfortran-${GCC_VERSION} /usr/local/bin/gfortran
8179
sudo mkdir -p /usr/local/gfortran
8280
sudo ln -sf /usr/local/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib

vcpkg/vcpkg.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"registries": [
99
{
1010
"kind": "git",
11-
"baseline": "7aaf1fda3fd1d86e6230b9a6d5ef686f353aa061",
11+
"baseline": "a3f181f299a54a0d67e6e60cac746ea265adfb29",
1212
"repository": "https://github.com/open-vcpkg/python-registry",
1313
"packages": [
1414
"arrow",
@@ -187,6 +187,10 @@
187187
"py-qscintilla",
188188
"py-rasterio",
189189
"py-requests",
190+
{
191+
"name": "py-scipy",
192+
"platform": "!windows"
193+
},
190194
"py-shapely",
191195
"py-six",
192196
"py-urllib3",

0 commit comments

Comments
 (0)