Merge pull request #309 from VirtualPlanetaryLaboratory/download-arti…

…fact

Tweaks to make coverage

.github/workflows/pip-install.yml

@@ -45,8 +45,10 @@ jobs:
         run: |
           python -m cibuildwheel --output-dir wheelhouse
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload wheel artifact
+        uses: actions/upload-artifact@v4
         with:
+          name: wheel-${{ matrix.os }}-${{ matrix.python-version }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -77,17 +79,24 @@ jobs:
       - name: Build sdist
         run: python setup.py sdist
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload sdist artifact
+        uses: actions/upload-artifact@v4
         with:
+          name: sdist-${{ matrix.os }}-${{ matrix.python-version }}
           path: dist/*.tar.gz
 
   upload_pypi:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     steps:
+     - uses: actions/download-artifact@v4
+        with:
+          name: wheel-${{ matrix.os }}-${{ matrix.python-version }}
+          path: wheelhouse
+
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          name: sdist-${{ matrix.os }}-${{ matrix.python-version }}
           path: dist
 
       # Only push to PyPI if we're on the public repo!

Makefile

@@ -68,12 +68,12 @@ test:
 	-pytest --tb=short
 
 coverage:
-	rm -f gcov/*.gcda gcov/*.gcno .coverage
+	rm -f ./gcov/*.gcda ./gcov/*.gcno ./.coverage
 	mkdir -p gcov
-	cd gcov && gcc -coverage -o ../bin/vplanet ../src/*.c -lm
+	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
+	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`.'