Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/build-macos-qt6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
osx-architecture: "arm64"
name: build (macos)
runs-on: ${{ matrix.os }}
env:
FC: gfortran
GCC_VERSION: 15

steps:
- name: 🐣 Checkout
Expand Down Expand Up @@ -56,6 +59,28 @@ jobs:
echo $(brew --prefix flex)/bin >> $GITHUB_PATH
echo $(brew --prefix libtool)/bin >> $GITHUB_PATH

- name: Symlink gfortran (macOS)
if: matrix.os == 'macos-14'
run: |
# make sure gfortran is available
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
# https://github.com/actions/runner-images/issues/3371
# ln version - new path 'MacOS14'
sudo ln -fs /opt/homebrew/bin/gfortran-${GCC_VERSION} /usr/local/bin/gfortran
sudo mkdir -p /usr/local/gfortran
sudo ln -sf /opt/homebrew/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib

- name: Symlink gfortran (macOS-intel)
if: matrix.os == 'macos-14-intel'
run: |
# make sure gfortran is available
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
# https://github.com/actions/runner-images/issues/3371
# ln version - new path 'MacOS14'
sudo ln -fs /usr/local/bin/gfortran-${GCC_VERSION} /usr/local/bin/gfortran
sudo mkdir -p /usr/local/gfortran
sudo ln -sf /usr/local/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib

- uses: actions/setup-python@v6
with:
python-version: '3.11'
Expand Down
30 changes: 29 additions & 1 deletion vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
"registries": [
{
"kind": "git",
"baseline": "1c3ef0209e78dceceeca3c4d18f93540a19c37bc",
"baseline": "c8ff38b5c7e84ed2380f14cffb137bf76f9d6418",
"repository": "https://github.com/open-vcpkg/python-registry",
"packages": [
"arrow",
"python3",
"py-*",
"gdal",
Expand Down Expand Up @@ -112,17 +113,44 @@
"bindings": {
"description": "Determines whether Python bindings should be built",
"dependencies": [
{
"name": "arrow",
"features": [
"python"
],
"platform": "!windows"
},
{
"name": "arrow",
"platform": "windows"
},
{
"name": "gdal",
"features": [
"python"
]
},
{
"name": "py-adbc-postgresql",
"platform": "!windows"
},
{
"name": "py-adbc-sqlite",
"platform": "!windows"
},
"py-attrs",
"py-autopep8",
"py-beautifulsoup4",
"py-dateutil",
"py-duckdb",
{
"name": "py-geopandas",
"features": [
"fiona",
"arrow"
],
"platform": "!windows"
},
"py-isort",
"py-jinja2",
{
Expand Down