Skip to content

Commit 6c863ef

Browse files
committed
linux [pypi]
1 parent 1d8e08e commit 6c863ef

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/build_wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ${{ matrix.os }}
1010
strategy:
1111
matrix:
12-
os: [ macos-12, macos-13-xlarge, macos-14, ubuntu-latest, windows-latest ]
12+
os: [ macos-12, macos-13-xlarge, macos-14, ubuntu-24.04, windows-latest ]
1313

1414
steps:
1515
- uses: fortran-lang/setup-fortran@main
@@ -54,7 +54,7 @@ jobs:
5454
run: python -m cibuildwheel --output-dir wheelhouse
5555

5656
- name: Build wheels
57-
if: matrix.os == 'macos-14' || matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest'
57+
if: matrix.os == 'macos-14' || matrix.os == 'ubuntu-24.04' || matrix.os == 'windows-latest'
5858
env:
5959
MACOSX_DEPLOYMENT_TARGET: 14
6060
CIBW_BUILD: cp311-*
@@ -69,7 +69,7 @@ jobs:
6969
wheelhouse/*.whl
7070
7171
build-sdist-and-upload:
72-
runs-on: ubuntu-latest
72+
runs-on: ubuntu-24.04
7373
needs: [ 'build_wheels' ]
7474
environment: wheels
7575
if: github.repository_owner == 'cmbant'

camb/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
__author__ = "Antony Lewis"
99
__contact__ = "antony at cosmologist dot info"
1010
__url__ = "https://camb.readthedocs.io"
11-
__version__ = "1.5.8.1"
11+
__version__ = "1.5.8.2"
1212

1313
from . import baseconfig
1414

fortran/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ COMMON_FFLAGS = -MMD -cpp -ffree-line-length-none -fmax-errors=4 -fopenmp
9696
FFLAGS = -O3 $(COMMON_FFLAGS)
9797
DEBUGFLAGS = -g -fbacktrace -ffpe-trap=invalid,overflow,zero -fbounds-check $(COMMON_FFLAGS)
9898
ifeq ($(shell uname -s),Darwin)
99-
SFFLAGS = -dynamiclib #-fpic
99+
SFFLAGS = -dynamiclib #-fpic
100100
else
101101
SFFLAGS = -shared -fpic
102102
endif
103103

104-
ifneq ($(shell echo $(compiler_ver) | awk '{print ($$1 >= 14.0)}'),0)
105-
SFFLAGS += -static-libgfortran -static-libgcc -static-libquadmath
104+
ifneq ($(shell echo $(compiler_ver) | awk '{print ($$1 > 14.0)}'),0)
105+
SFFLAGS += -static-libgfortran -static-libgcc -static-libquadmath
106106
endif
107107

108108
MODOUT = -J$(OUTPUT_DIR)

fortran/config.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module config
33
use constants, only: const_twopi
44
implicit none
55

6-
character(LEN=*), parameter :: version = '1.5.8.1'
6+
character(LEN=*), parameter :: version = '1.5.8.2'
77

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

0 commit comments

Comments
 (0)