Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add macos build #620

Merged
merged 16 commits into from
Feb 25, 2025
Merged

Add macos build #620

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
92f0508
add macos
cvanelteren Feb 25, 2025
47fd818
update cibuild
cvanelteren Feb 25, 2025
0641ba6
add macos arm builds
cvanelteren Feb 25, 2025
2e00078
add explicit x86 support for macos
cvanelteren Feb 25, 2025
8780bd3
set arch flags for macos
cvanelteren Feb 25, 2025
d269575
update ld path
cvanelteren Feb 25, 2025
4e4d2dc
add macos-13 for x86 builds
cvanelteren Feb 25, 2025
06a0d79
update strategy
cvanelteren Feb 25, 2025
9860f9f
typo
cvanelteren Feb 25, 2025
7e58cc8
add arch
cvanelteren Feb 25, 2025
cb00939
Remove LD_LIBRARY_PATH from MacOS before_all block
molinav Feb 25, 2025
28bbd17
Replace macos-latest with macos-14
molinav Feb 25, 2025
19f0b8f
Remove DYLD_FALLBACK_LIBRARY_PATH from MacOS before_all block
molinav Feb 25, 2025
343af4f
Remove ARCHFLAGS from MacOS before_all block
molinav Feb 25, 2025
79b9423
Update comment about LD_LIBRARY_PATH
molinav Feb 25, 2025
b19d33d
Remove redundant entry in workflow matrix
molinav Feb 25, 2025
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
23 changes: 20 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,30 @@ jobs:
needs: [build_data]
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
include:
- os: ubuntu-latest
arch: x86_64
before_all: >-
echo "Starting BEFORE_ALL script" &&
echo "GEOS_DIR set to: ${GEOS_DIR}" &&
cd "{package}" &&
python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
- os: macos-13
arch: x86_64
before_all: >-
echo "Starting BEFORE_ALL script" &&
echo "GEOS_DIR set to: ${GEOS_DIR}" &&
cd "{package}" &&
python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
- os: macos-14
arch: arm64
before_all: >-
echo "Starting BEFORE_ALL script" &&
echo "GEOS_DIR set to: ${GEOS_DIR}" &&
cd "{package}" &&
python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
- os: windows-latest
arch: x86_64
before_all: >-
echo Starting BEFORE_ALL script &&
echo GEOS_DIR set to: %GEOS_DIR% &&
Expand All @@ -83,7 +98,8 @@ jobs:
env:
CIBW_BUILD_VERBOSITY: 1
CIBW_BUILD: "cp39* cp310* cp311* cp312* cp313*"
CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l"
CIBW_ARCHS_MACOS: ${{ matrix.arch }}
CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-linux_aarch64 *-linux_armv7l"
CIBW_BEFORE_ALL: ${{ matrix.before_all }}
CIBW_TEST_EXTRAS: "test"
CIBW_TEST_COMMAND: "python -m pytest {project}/packages/basemap"
Expand All @@ -93,7 +109,8 @@ jobs:
PIP_PREFER_BINARY=1
PYTHONUNBUFFERED=1
LD_LIBRARY_PATH="${GEOS_DIR}/lib"
# LD_LIBRARY_PATH in environment is needed by auditwheel (Linux).
# LD_LIBRARY_PATH in environment is needed by
# auditwheel (Linux) and delocate (MacOS).
with:
package-dir: "packages/basemap"
output-dir: "packages/basemap/dist"
Expand Down