test [pypi]

cmbant · Jun 7, 2024 · ef1c9b5 · ef1c9b5
1 parent 88818dc
commit ef1c9b5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-11, macos-12, macos-13, macos-13-xlarge, macos-14, ubuntu-latest, windows-latest ]
+        os: [ macos-11, macos-12, macos-13, flyci-macos-large-latest-m2, macos-14, ubuntu-latest, windows-latest ]
 
     steps:
       - uses: awvwgk/setup-fortran@main
@@ -34,7 +34,7 @@ jobs:
         run: python -m pip install cibuildwheel==2.18.1
 
       - name: Build macos-13 wheels
-        if: matrix.os == 'macos-13' || matrix.os == 'macos-13-xlarge'
+        if: matrix.os == 'macos-13' || matrix.os == 'macos-13-xlarge' || matrix.os == 'flyci-macos-large-latest-m2'
         env:
           MACOSX_DEPLOYMENT_TARGET: 13
           CIBW_BUILD: cp311-*
@@ -54,6 +54,8 @@ jobs:
       - name: Build macos-11 wheels
         if: matrix.os == 'macos-11'
         env:
+          # all cp3xx, since old macs seem to only use osx 11+ builds if this is set not "none"
+          # see consistency with get_tag() in setup.py
           MACOSX_DEPLOYMENT_TARGET: 11
           CIBW_SKIP: pp*
           CIBW_BUILD_VERBOSITY: 1
@@ -65,8 +67,6 @@ jobs:
           MACOSX_DEPLOYMENT_TARGET: 14
           CIBW_BUILD: cp311-*
           CIBW_SKIP: pp* *-win32 *-manylinux_i686 *musllinux*
-          #CIBW_TEST_REQUIRES: scipy sympy
-          #CIBW_TEST_COMMAND: python -m unittest camb.tests.camb_test
           CIBW_BUILD_VERBOSITY: 1
         run: python -m cibuildwheel --output-dir wheelhouse
 
@@ -151,4 +151,4 @@ jobs:
         run: python -m pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ camb
 
       - name: test
-        run: python -m unittest camb.tests.camb_test
+        run: time python -m unittest camb.tests.camb_test
diff --git a/camb/__init__.py b/camb/__init__.py
@@ -7,7 +7,7 @@
 __author__ = "Antony Lewis"
 __contact__ = "antony at cosmologist dot info"
 __url__ = "https://camb.readthedocs.io"
-__version__ = "1.5.4.3"
+__version__ = "1.5.4.4"
 
 from . import baseconfig
 

diff --git a/camb/tests/camb_test.py b/camb/tests/camb_test.py
@@ -13,7 +13,7 @@
 from camb import model, correlations, bbn, dark_energy, initialpower
 from camb.baseconfig import CAMBParamRangeError, CAMBValueError
 
-fast = 'ci fast' in os.getenv("TRAVIS_COMMIT_MESSAGE", "")
+fast = 'ci fast' in os.getenv("TRAVIS_COMMIT_MESSAGE", "") or os.getenv("GITHUB_ACTIONS")
 
 
 class CambTest(unittest.TestCase):

diff --git a/fortran/config.f90 b/fortran/config.f90
@@ -3,7 +3,7 @@ module config
     use constants, only: const_twopi
     implicit none
 
-    character(LEN=*), parameter :: version = '1.5.4.3'
+    character(LEN=*), parameter :: version = '1.5.4.4'
 
     integer :: FeedbackLevel = 0 !if >0 print out useful information about the model