From ec784dcb67de40884cd9b0542c475bbca50f5cb5 Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Tue, 13 Aug 2024 10:18:19 -0400 Subject: [PATCH 1/4] 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 b58f26a8..0722e8bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,42 +54,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 (MacOS) - if: startsWith(matrix.os, 'macos') - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_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" + 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 }} + - name: Coveralls Finished + uses: coverallsapp/github-action@v2 + with: + parallel-finished: true + diff --git a/pyproject.toml b/pyproject.toml index 5f54d48f..de6d8972 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,6 @@ dependencies = [ [project.optional-dependencies] pysatcdf = ["pysatCDF"] test = [ - "coveralls", "flake8", "flake8-docstrings", "hacking >= 1.0", From d3a34950c64a2e7184d02f9a10d971573226b45d Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Tue, 13 Aug 2024 13:24:33 -0400 Subject: [PATCH 2/4] MAINT: update coveralls --- .github/workflows/pysat_rc.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pysat_rc.yml b/.github/workflows/pysat_rc.yml index 69ce46c4..be5d4ad5 100644 --- a/.github/workflows/pysat_rc.yml +++ b/.github/workflows/pysat_rc.yml @@ -34,22 +34,22 @@ jobs: python -c "import pysat; pysat.params['data_dirs'] = 'pysatData'" - name: Test with pytest - run: pytest -vs --cov=pysatSeasons/ + run: pytest - - name: Publish results to coveralls - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_PARALLEL: true - run: coveralls --rcfile=setup.cfg --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 d4989bb5f4b74f449f213f6722e52e9ef9c829b4 Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Tue, 13 Aug 2024 13:24:43 -0400 Subject: [PATCH 3/4] BUG: clean up pyproject --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index de6d8972..27f4547f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,6 @@ dependencies = [ ] [project.optional-dependencies] -pysatcdf = ["pysatCDF"] test = [ "flake8", "flake8-docstrings", From eefd02cc84bed2e222a9841b6682021610126f7a Mon Sep 17 00:00:00 2001 From: Jeff Klenzing <19592220+jklenzing@users.noreply.github.com> Date: Tue, 13 Aug 2024 13:58:31 -0400 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e1ef536..8bfa9515 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add workflow for testing the install of pysatSeasons RC from pip - Dropped tests for deprecated pysat instruments - Implement pyproject.toml + - Implement coveralls app for GitHub Actions ## [0.2.0] - 2022-08-12 - New Features