Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.
Closed
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
url = https://github.com/scipy/scipy.git
[submodule "multibuild"]
path = multibuild
url = https://github.com/multi-build/multibuild.git
url = https://github.com/tylerjereddy/multibuild.git
[submodule "gfortran-install"]
path = gfortran-install
url = https://github.com/MacPython/gfortran-install.git
Expand Down
7 changes: 7 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pr:

variables:
BUILD_COMMIT: "master"
MACOSX_DEPLOYMENT_TARGET: "10.9"

jobs:
- template: azure-posix.yml
Expand Down Expand Up @@ -55,21 +56,25 @@ jobs:
MB_PYTHON_VERSION: "3.8"
MB_PYTHON_OSX_VER: "10.9"
PLAT: universal2
MACOSX_DEPLOYMENT_TARGET: "12.0"
osx-Py38_arm64:
MB_PYTHON_VERSION: "3.8"
MB_PYTHON_OSX_VER: "10.9"
PLAT: arm64
MACOSX_DEPLOYMENT_TARGET: "12.0"
osx-Py39:
MB_PYTHON_VERSION: "3.9"
MB_PYTHON_OSX_VER: "10.9"
osx-Py39-universal2:
MB_PYTHON_VERSION: "3.9"
MB_PYTHON_OSX_VER: "10.9"
PLAT: universal2
MACOSX_DEPLOYMENT_TARGET: "12.0"
osx-Py39_arm64:
MB_PYTHON_VERSION: "3.9"
MB_PYTHON_OSX_VER: "10.9"
PLAT: arm64
MACOSX_DEPLOYMENT_TARGET: "12.0"
osx-Py310:
MB_PYTHON_VERSION: "3.10"
MB_PYTHON_OSX_VER: "10.9"
Expand All @@ -78,7 +83,9 @@ jobs:
MB_PYTHON_VERSION: "3.10"
MB_PYTHON_OSX_VER: "10.9"
PLAT: universal2
MACOSX_DEPLOYMENT_TARGET: "12.0"
osx-Py310_arm64:
MB_PYTHON_VERSION: "3.10"
MB_PYTHON_OSX_VER: "11.0"
PLAT: arm64
MACOSX_DEPLOYMENT_TARGET: "12.0"
6 changes: 0 additions & 6 deletions azure-posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
# Platform variables used in multibuild scripts
if [ `uname` == 'Darwin' ]; then
echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]osx"
echo "##vso[task.setvariable variable=MACOSX_DEPLOYMENT_TARGET]10.9"
else
echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]linux"
fi
Expand Down Expand Up @@ -82,11 +81,6 @@ jobs:
displayName: Install wheel and test
condition: ne(variables['PLAT'], 'arm64')

- bash: |
set -xe
for file in `find ./wheelhouse -type f -name '*11_0_arm64*.whl'`; do mv -v "$file" "${file/11_0_arm64/12_0_arm64}"; done
displayName: "Rename MacOS arm64 wheels for version 12.0 minimum"
condition: eq(variables['PLAT'], 'arm64')

- bash: |
set -xe
Expand Down
2 changes: 1 addition & 1 deletion multibuild
Submodule multibuild updated 1 files
+9 −3 osx_utils.sh