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 5f83051 commit 6c0bfae
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
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
Expand Down
6 changes: 2 additions & 4 deletions camb/_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@ def global_error_message(self):
return bytearray(self._global_error_message).decode('ascii').strip()

def check_global_error(self, reference=''):
code = self.global_error_flag
if code:
err = config.global_error_message()
if code := self.global_error_flag:
self.global_error_flag = 0
if reference:
reference = 'Error in Fortran called from %s:\n' % reference
else:
reference = ''
if err:
if err := config.global_error_message():
raise CAMBError(reference + '%s' % err)
else:
raise CAMBError(reference + 'Error code: %s' % code)
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 #-fpic
SFFLAGS = -dynamiclib -static-libgfortran #-fpic
else
SFFLAGS = -shared -fpic
endif
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def finalize_options(self):

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

Expand Down

0 comments on commit 6c0bfae

Please sign in to comment.