Skip to content

Commit

Permalink
wheels [pypi]
Browse files Browse the repository at this point in the history
  • Loading branch information
cmbant committed Aug 19, 2024
1 parent 6c0bfae commit 92c969c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
29 changes: 15 additions & 14 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ macos-12, macos-13, macos-13-xlarge, macos-14, ubuntu-latest, windows-latest ]
os: [ macos-12, macos-14, ubuntu-latest, windows-latest ]

steps:
- uses: fortran-lang/setup-fortran@main
if: matrix.os == 'windows-latest'
id: setup-fortran
with:
compiler: gcc
version: 13
version: 14

- run: ln -s $(which gfortran-12) /usr/local/bin/gfortran
- run: ln -s $(which gfortran-14) /usr/local/bin/gfortran
if: matrix.os != 'windows-latest'

- run: gfortran --version
Expand All @@ -33,29 +33,30 @@ jobs:
- name: Install cibuildwheel
run: python -m pip install cibuildwheel

- name: Build macos-13 wheels
if: matrix.os == 'macos-13' || matrix.os == 'macos-13-xlarge'
env:
MACOSX_DEPLOYMENT_TARGET: 13
CIBW_BUILD: cp311-*
CIBW_SKIP: pp*
CIBW_BUILD_VERBOSITY: 1
run: python -m cibuildwheel --output-dir wheelhouse
# - name: Build macos-13 wheels
# if: matrix.os == 'macos-13' || matrix.os == 'macos-13-xlarge'
# env:
# MACOSX_DEPLOYMENT_TARGET: 13
# CIBW_BUILD: cp311-*
# CIBW_SKIP: pp*
# CIBW_BUILD_VERBOSITY: 1
# run: python -m cibuildwheel --output-dir wheelhouse

- name: Build macos-12 wheels
if: matrix.os == 'macos-12'
env:
# all cp3xx, since old macs seem to only use osx 12+ builds if this is set not "none"
# see consistency with get_tag() in setup.py
MACOSX_DEPLOYMENT_TARGET: 12
MACOSX_DEPLOYMENT_TARGET: 10.15
CIBW_BUILD: cp311-*
CIBW_SKIP: pp*
CIBW_BUILD_VERBOSITY: 1
run: python -m cibuildwheel --output-dir wheelhouse

- name: Build wheels
if: matrix.os == 'macos-14' || matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest'
env:
MACOSX_DEPLOYMENT_TARGET: 14
MACOSX_DEPLOYMENT_TARGET: 12
CIBW_BUILD: cp311-*
CIBW_SKIP: pp* *-win32 *-manylinux_i686 *musllinux*
CIBW_BUILD_VERBOSITY: 1
Expand Down Expand Up @@ -83,7 +84,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"
cache: pip
cache-dependency-path: "setup.py"

Expand Down
2 changes: 1 addition & 1 deletion camb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
__author__ = "Antony Lewis"
__contact__ = "antony at cosmologist dot info"
__url__ = "https://camb.readthedocs.io"
__version__ = "1.5.8"
__version__ = "1.5.8.1"

from . import baseconfig

Expand Down
2 changes: 1 addition & 1 deletion fortran/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ COMMON_FFLAGS = -MMD -cpp -ffree-line-length-none -fmax-errors=4 -fopenmp
FFLAGS = -O3 $(COMMON_FFLAGS)
DEBUGFLAGS = -g -fbacktrace -ffpe-trap=invalid,overflow,zero -fbounds-check $(COMMON_FFLAGS)
ifeq ($(shell uname -s),Darwin)
SFFLAGS = -dynamiclib -static-libgfortran #-fpic
SFFLAGS = -dynamiclib -static-libgfortran -static-libgcc -static-libquadmath #-fpic
else
SFFLAGS = -shared -fpic
endif
Expand Down
2 changes: 1 addition & 1 deletion fortran/config.f90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module config
use constants, only: const_twopi
implicit none

character(LEN=*), parameter :: version = '1.5.7'
character(LEN=*), parameter :: version = '1.5.8.1'

integer :: FeedbackLevel = 0 !if >0 print out useful information about the model

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ def finalize_options(self):

def get_tag(self):
_, _, plat = super().get_tag()
if "osx_12" in plat:
return _, _, plat
# if "osx_12" in plat:
# return _, _, plat
return "py3", "none", plat


Expand Down

0 comments on commit 92c969c

Please sign in to comment.