From c32c10be555f37b320d92aea2fc1e5a6ea5a4e81 Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Tue, 13 Aug 2024 10:14:06 -0400 Subject: [PATCH 1/5] MAINT: use coveralls app --- .github/workflows/main.yml | 46 ++++++++++---------------------------- pyproject.toml | 1 - 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a38ada92..a8562cf5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,42 +78,20 @@ jobs: - name: Test with pytest run: pytest - - name: Coveralls Parallel (Ubuntu) - if: startsWith(matrix.os, 'ubuntu') - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - COVERALLS_PARALLEL: true - run: | - curl -sL https://coveralls.io/coveralls-linux.tar.gz | tar -xz - ./coveralls report --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }} - - - name: Coveralls Parallel (Windows) - if: startsWith(matrix.os, 'windows') - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - COVERALLS_PARALLEL: true - run: | - curl -L https://github.com/coverallsapp/coverage-reporter/releases/latest/download/coveralls-windows.exe -o coveralls.exe - ./coveralls.exe report --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }} + - name: Coveralls Parallel + uses: coverallsapp/github-action@v2 + with: + flag-name: run-${{ join(matrix.*, '-') }} + parallel: true - - name: Publish results to coveralls (MacOS) - if: startsWith(matrix.os, 'macos') - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - COVERALLS_PARALLEL: true - run: | - coveralls --rcfile=pyproject.toml --service=github - finish: name: Finish Coverage Analysis needs: build - if: always() - runs-on: "ubuntu-latest" + if: ${{ always() }} + runs-on: ubuntu-latest steps: - - name: Coveralls Finish - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - COVERALLS_PARALLEL: true - run: | - curl -sL https://coveralls.io/coveralls-linux.tar.gz | tar -xz - ./coveralls done --build-number ${{ github.run_number }} \ No newline at end of file + - name: Coveralls Finished + uses: coverallsapp/github-action@v2 + with: + parallel-finished: true + diff --git a/pyproject.toml b/pyproject.toml index 5d8f1d4e..49306051 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,6 @@ dependencies = [ [project.optional-dependencies] pysatcdf = ["pysatCDF"] test = [ - "coveralls", "flake8", "flake8-docstrings", "hacking >= 1.0", From 5d779d0eb1e1b9603f9afda36c43ecd0a7677293 Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Tue, 13 Aug 2024 10:14:34 -0400 Subject: [PATCH 2/5] BUG: whitespace --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a8562cf5..4c42bd23 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,7 +78,7 @@ jobs: - name: Test with pytest run: pytest - - name: Coveralls Parallel + - name: Coveralls Parallel uses: coverallsapp/github-action@v2 with: flag-name: run-${{ join(matrix.*, '-') }} From 0a4db1c401b2b1c0cf1ddabac0eee2b0ae20ede6 Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Tue, 13 Aug 2024 13:36:14 -0400 Subject: [PATCH 3/5] MAINT: use coveralls app in rc test --- .github/workflows/pysat_rc.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pysat_rc.yml b/.github/workflows/pysat_rc.yml index 84bf06b4..db17f76c 100644 --- a/.github/workflows/pysat_rc.yml +++ b/.github/workflows/pysat_rc.yml @@ -42,20 +42,20 @@ jobs: - name: Test with pytest run: pytest - - name: Publish results to coveralls - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_PARALLEL: true - run: coveralls --rcfile=pyproject.toml --service=github + - name: Coveralls Parallel + uses: coverallsapp/github-action@v2 + with: + flag-name: run-${{ join(matrix.*, '-') }} + parallel: true finish: name: Finish Coverage Analysis needs: build + if: ${{ always() }} runs-on: ubuntu-latest steps: - name: Coveralls Finished - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - pip install --upgrade coveralls - coveralls --service=github --finish + uses: coverallsapp/github-action@v2 + with: + parallel-finished: true + From e827fe621b2337ff9bc10cd39371f376438721e3 Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Tue, 13 Aug 2024 13:36:22 -0400 Subject: [PATCH 4/5] DOC: update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db7498b4..03f0557d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/). -## [0.0.6] - 2024-07-31 +## [0.0.6] - 2024-08-26 * New Instruments * DE2 VEFIMAGB - electric and magnetic field on the same cadence * MAVEN MAG @@ -44,6 +44,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). * Update NEP29 standards for Jun 2024 * Updated standards for pandas, numpy, and pysat * Updated versions in GitHub Actions + * Implement coveralls app in GitHUb Actions ## [0.0.5] - 2023-06-27 * New Instruments From 47f7c3ca4fc55959bb03f0b7e888f1b1799a9410 Mon Sep 17 00:00:00 2001 From: Jeff Klenzing <19592220+jklenzing@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:03:47 -0400 Subject: [PATCH 5/5] Update CHANGELOG.md Co-authored-by: Angeline Burrell --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03f0557d..8755300c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). * Update NEP29 standards for Jun 2024 * Updated standards for pandas, numpy, and pysat * Updated versions in GitHub Actions - * Implement coveralls app in GitHUb Actions + * Implement coveralls app in GitHub Actions ## [0.0.5] - 2023-06-27 * New Instruments