Skip to content

Commit 6371dc9

Browse files
committed
cleanup
1 parent 219ddef commit 6371dc9

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

.github/workflows/build_wheels.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ jobs:
4848
- name: Build macos-12 wheels
4949
if: matrix.os == 'macos-12'
5050
env:
51-
# all cp3xx, since old macs seem to only use osx 12+ builds if this is set not "none"
52-
# see consistency with get_tag() in setup.py
5351
MACOSX_DEPLOYMENT_TARGET: 12
5452
CIBW_BUILD: cp311-*
5553
CIBW_SKIP: pp*
@@ -138,7 +136,7 @@ jobs:
138136
runs-on: ${{ matrix.os }}
139137
strategy:
140138
matrix:
141-
os: [ macos-12, macos-13, macos-13-xlarge, macos-14, ubuntu-latest, windows-latest ]
139+
os: [ macos-12, macos-13, macos-14, ubuntu-20.04, windows-latest ]
142140

143141
steps:
144142
- uses: actions/setup-python@v5

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
- FORTRAN="test"
4040
language: minimal
4141
- name: "Jammy + Python 3.12"
42+
if: NOT commit_message =~ /\[pypi\]/ AND NOT commit_message =~ /\[testpypi\]/
4243
addons:
4344
apt:
4445
packages:

fortran/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ SFFLAGS += -static-libgfortran -static-libgcc -static-libquadmath
102102
endif
103103
else
104104
SFFLAGS = -shared -fpic
105-
ifneq ($(CIBW_BUILD),)
106-
SFFLAGS += -static-libgfortran -static-libgcc
107-
endif
108105
endif
109106

110107

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,5 +287,4 @@ def run(self):
287287
package_data={'camb': [DLLNAME, 'HighLExtrapTemplate_lenspotentialCls.dat',
288288
'PArthENoPE_880.2_marcucci.dat', 'PArthENoPE_880.2_standard.dat',
289289
'PRIMAT_Yp_DH_Error.dat', 'PRIMAT_Yp_DH_ErrorMC_2021.dat']},
290-
test_suite='camb.tests'
291290
)

0 commit comments

Comments
 (0)