From ae96e596144cbafe2425635ef5697d2104e39fcf Mon Sep 17 00:00:00 2001 From: Rory Barnes Date: Thu, 5 Sep 2024 17:34:53 -0700 Subject: [PATCH 1/2] Changed make coverage so as not to cause errors. --- .github/workflows/pip-install.yml | 1 + Makefile | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pip-install.yml b/.github/workflows/pip-install.yml index 3cb143e2..92762706 100644 --- a/.github/workflows/pip-install.yml +++ b/.github/workflows/pip-install.yml @@ -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 diff --git a/Makefile b/Makefile index 60888c98..938bfb5a 100644 --- a/Makefile +++ b/Makefile @@ -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`.' From b36cecae49724d7c38c015572c871bed21360da4 Mon Sep 17 00:00:00 2001 From: RoryBarnes Date: Fri, 6 Sep 2024 08:51:35 -0700 Subject: [PATCH 2/2] Removed macos-11 temporarily from pip-install.yml --- .github/workflows/pip-install.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pip-install.yml b/.github/workflows/pip-install.yml index 92762706..97888d36 100644 --- a/.github/workflows/pip-install.yml +++ b/.github/workflows/pip-install.yml @@ -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 @@ -40,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 @@ -59,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