Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
cmbant committed Aug 19, 2024
1 parent 219ddef commit 6371dc9
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 7 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ jobs:
- 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
CIBW_BUILD: cp311-*
CIBW_SKIP: pp*
Expand Down Expand Up @@ -138,7 +136,7 @@ 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-13, macos-14, ubuntu-20.04, windows-latest ]

steps:
- uses: actions/setup-python@v5
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
- FORTRAN="test"
language: minimal
- name: "Jammy + Python 3.12"
if: NOT commit_message =~ /\[pypi\]/ AND NOT commit_message =~ /\[testpypi\]/
addons:
apt:
packages:
Expand Down
3 changes: 0 additions & 3 deletions fortran/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ SFFLAGS += -static-libgfortran -static-libgcc -static-libquadmath
endif
else
SFFLAGS = -shared -fpic
ifneq ($(CIBW_BUILD),)
SFFLAGS += -static-libgfortran -static-libgcc
endif
endif


Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,5 +287,4 @@ def run(self):
package_data={'camb': [DLLNAME, 'HighLExtrapTemplate_lenspotentialCls.dat',
'PArthENoPE_880.2_marcucci.dat', 'PArthENoPE_880.2_standard.dat',
'PRIMAT_Yp_DH_Error.dat', 'PRIMAT_Yp_DH_ErrorMC_2021.dat']},
test_suite='camb.tests'
)

0 comments on commit 6371dc9

Please sign in to comment.