Skip to content

update to macos-latest #210

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
14 changes: 7 additions & 7 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-13]
os: [ubuntu-latest, macos-latest]
PLAT: [i686, x86_64]
INTERFACE64: ['0', '1']
MB_ML_VER: ['2014']
MB_ML_LIBC: ['manylinux']
include:
- os: macos-13
- os: macos-latest
PLAT: arm64
INTERFACE64: '1'
- os: macos-13
- os: macos-latest
PLAT: arm64
INTERFACE64: '0'
- os: ubuntu-latest
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

exclude:
- PLAT: i686
os: macos-13
os: macos-latest
- PLAT: i686
INTERFACE64: '1'
env:
Expand All @@ -94,9 +94,9 @@ jobs:
echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV;

- uses: maxim-lobanov/[email protected]
if: ${{ matrix.os == 'macos-13' }}
if: ${{ matrix.os == 'macos-latest' }}
with:
xcode-version: '14.3'
xcode-version: '15.4'

- name: Print some Environment variable
run: |
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
version=$(cd OpenBLAS && git describe --tags --abbrev=8 | sed -e "s/^v\(.*\)-g.*/\1/" | sed -e "s/-/./g")
sed -e "s/^version = .*/version = \"${version}\"/" -i.bak pyproject.toml
fi
if [ "macos-13" == "${{ matrix.os }}" ]; then
if [ "macos-latest" == "${{ matrix.os }}" ]; then
source tools/build_wheel.sh
else
libc=${MB_ML_LIBC:-manylinux}
Expand Down
2 changes: 1 addition & 1 deletion gfortran-install
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "scipy-openblas64"
# v0.3.30
version = "0.3.30.0.1"
version = "0.3.30.0.2"
requires-python = ">=3.7"
description = "Provides OpenBLAS for python packaging"
readme = "README.md"
Expand Down
6 changes: 2 additions & 4 deletions tools/build_steps.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# Build script for manylinux and OSX
BUILD_PREFIX=/usr/local
# OSX gfortran archive
GFORTRAN_DMG="archives/gfortran-4.9.0-Mavericks.dmg"

ROOT_DIR=$(dirname $(dirname "${BASH_SOURCE[0]}"))
source ${ROOT_DIR}/multibuild/common_utils.sh
source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh

MB_PYTHON_VERSION=3.9

function before_build {
# Manylinux Python version set in build_lib
if [ -n "$IS_OSX" ]; then
sudo mkdir -p /usr/local/lib
sudo chmod 777 /usr/local/lib
source ${ROOT_DIR}/multibuild/osx_utils.sh
get_macpython_environment ${MB_PYTHON_VERSION} venv
source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh
Expand Down Expand Up @@ -89,7 +88,6 @@ function build_lib {
#
# Depends on globals
# BUILD_PREFIX - install suffix e.g. "/usr/local"
# GFORTRAN_DMG
# MB_ML_VER
set -x
local plat=${1:-$PLAT}
Expand Down
Loading