Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed make coverage so as not to cause errors. #311

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Changed make coverage so as not to cause errors. #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae96e59
Changed make coverage so as not to cause errors.
Sep 6, 2024
b36ceca
Removed macos-11 temporarily from pip-install.yml
RoryBarnes Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/pip-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, macos-14]
os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
exclude:
- os: ubuntu-22.04
Expand All @@ -31,6 +31,7 @@ jobs:

- name: Install cibuildwheel
run: |
python -m pip install -U pip
python -m pip install cibuildwheel

- name: Build wheel on Linux
Expand All @@ -39,7 +40,7 @@ jobs:
python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_BUILD: 'cp3?-*'
CIBW_SKIP: '*-manylinux_i686'
CIBW_SKIP: '*-manylinux_i686'
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014

- name: Build wheel on macOS
Expand All @@ -58,7 +59,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, macos-14]
os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
exclude:
- os: ubuntu-22.04
Expand Down
13 changes: 6 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,12 @@ test:
-pytest --tb=short

coverage:
rm -f ./gcov/*.gcda ./gcov/*.gcno ./.coverage
mkdir -p ./gcov
cd gcov && gcc -coverage -o ./../bin/vplanet ./../src/*.c -lm
pwd
python -m pytest --tb=short tests --junitxml=./junit/test-results.xml
lcov --capture --directory ./gcov --output-file ./.coverage
genhtml ./.coverage --output-directory ./gcov/html
-rm -f ./gcov/*.gcda ./gcov/*.gcno ./.coverage
-mkdir -p ./gcov
-cd gcov && gcc -coverage -o ./../bin/vplanet ./../src/*.c -lm
-python -m pytest --tb=short tests --junitxml=./junit/test-results.xml
-lcov --capture --directory ./gcov --output-file ./.coverage
-genhtml ./.coverage --output-directory ./gcov/html

docs:
-make -C docs html && echo 'Documentation available at `docs/.build/html/index.html`.'
Expand Down
Loading