Skip to content

Commit

Permalink
Merge pull request #311 from VirtualPlanetaryLaboratory/download-arti…
Browse files Browse the repository at this point in the history
…fact

Changed make coverage so as not to cause errors.
  • Loading branch information
RoryBarnes authored Sep 6, 2024
2 parents 887fe0f + b36ceca commit 3b592bb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/pip-install.yml
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
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

0 comments on commit 3b592bb

Please sign in to comment.