From f2d3f0fbff848ddf49fa6b2f95c9a9fefe59c574 Mon Sep 17 00:00:00 2001 From: Aadarsh Govada Date: Mon, 22 Jul 2024 16:28:11 -0400 Subject: [PATCH 01/11] Try coveralls pip installation --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6ab5ffa..e646c8fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -96,16 +96,17 @@ jobs: 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: Install Coveralls on MacOS + if: startswith(matrix.os, 'macos') + run: | + pip install coveralls + - name: Coveralls Parallel (MacOS) if: startsWith(matrix.os, 'macos') env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} COVERALLS_PARALLEL: true run: | - brew tap coverallsapp/coveralls --quiet - brew install coveralls --quiet - ls -lh .coverage - ls -lh coverage.xml coveralls report coverage.xml --format=cobertura --verbose --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }} --debug --dry-run finish: From 93df6df5a1e69f41097a24b6c94c795f91998d19 Mon Sep 17 00:00:00 2001 From: Aadarsh-Govada <159968006+Aadarsh-Govada@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:37:58 -0400 Subject: [PATCH 02/11] Use verbose and showlocals pytest versions --- .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 e646c8fb..cb917344 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,7 +76,7 @@ jobs: run: flake8 . --count --exit-zero --max-complexity=10 --statistics - name: Test with pytest - run: pytest + run: pytest -v --showlocals - name: Coveralls Parallel (Ubuntu) if: startsWith(matrix.os, 'ubuntu') From ca77acf8a6c64a5c2d8d617f65b69e3ed7512344 Mon Sep 17 00:00:00 2001 From: Aadarsh-Govada <159968006+Aadarsh-Govada@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:51:05 -0400 Subject: [PATCH 03/11] Cap cdasws version at 1.8.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3684998a..f035fe4d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ beautifulsoup4 -cdasws +cdasws<=1.8.2 cdflib>=0.4.4 lxml netCDF4 From 9c77cabcb309309652caa1b763e01142f350d5cc Mon Sep 17 00:00:00 2001 From: Aadarsh Govada Date: Tue, 30 Jul 2024 10:05:03 -0400 Subject: [PATCH 04/11] Restore MacOS brew coveralls installation --- .github/workflows/main.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb917344..53b81e49 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,23 +52,19 @@ jobs: python setup.py develop cd ../pysatNASA pip install . - - name: Install NEP29 dependencies if: ${{ matrix.test_config == 'NEP29'}} run: | pip install numpy==${{ matrix.numpy_ver }} pip install --upgrade-strategy only-if-needed .[test] - - name: Install standard dependencies if: ${{ matrix.test_config == 'latest'}} run: | pip install .[test] - - name: Set up pysat run: | mkdir pysatData python -c "import pysat; pysat.params['data_dirs'] = 'pysatData'" - - name: Test PEP8 compliance run: flake8 . --count --select=D,E,F,H,W --show-source --statistics @@ -76,7 +72,7 @@ jobs: run: flake8 . --count --exit-zero --max-complexity=10 --statistics - name: Test with pytest - run: pytest -v --showlocals + run: pytest - name: Coveralls Parallel (Ubuntu) if: startsWith(matrix.os, 'ubuntu') @@ -86,7 +82,6 @@ jobs: 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: @@ -95,20 +90,17 @@ jobs: 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: Install Coveralls on MacOS - if: startswith(matrix.os, 'macos') - run: | - pip install coveralls - - name: Coveralls Parallel (MacOS) if: startsWith(matrix.os, 'macos') env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} COVERALLS_PARALLEL: true run: | + brew tap coverallsapp/coveralls --quiet + brew install coveralls --quiet + ls -lh .coverage + ls -lh coverage.xml coveralls report coverage.xml --format=cobertura --verbose --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }} --debug --dry-run - finish: name: Finish Coverage Analysis needs: build @@ -121,4 +113,4 @@ jobs: COVERALLS_PARALLEL: true run: | curl -sL https://coveralls.io/coveralls-linux.tar.gz | tar -xz - ./coveralls done --build-number ${{ github.run_number }} + ./coveralls done --build-number ${{ github.run_number }} \ No newline at end of file From d4af585dc1f582bb415f4a88d1f2c1461abc9388 Mon Sep 17 00:00:00 2001 From: Aadarsh Govada Date: Tue, 30 Jul 2024 10:41:33 -0400 Subject: [PATCH 05/11] Remove --quiet from coveralls installation on MacOS --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53b81e49..6f86b746 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -96,8 +96,8 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} COVERALLS_PARALLEL: true run: | - brew tap coverallsapp/coveralls --quiet - brew install coveralls --quiet + brew tap coverallsapp/coveralls + brew install coveralls ls -lh .coverage ls -lh coverage.xml coveralls report coverage.xml --format=cobertura --verbose --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }} --debug --dry-run From ec99d151ea3432b40668df63aca6c07397267993 Mon Sep 17 00:00:00 2001 From: Aadarsh Govada Date: Tue, 30 Jul 2024 11:55:03 -0400 Subject: [PATCH 06/11] Revert to rcfile coveralls publishing for MacOS --- .github/workflows/main.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6f86b746..58897909 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,17 +90,13 @@ jobs: 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) + - name: Publish results to coveralls (MacOS) if: startsWith(matrix.os, 'macos') env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} COVERALLS_PARALLEL: true run: | - brew tap coverallsapp/coveralls - brew install coveralls - ls -lh .coverage - ls -lh coverage.xml - coveralls report coverage.xml --format=cobertura --verbose --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }} --debug --dry-run + coveralls --rcfile=pyproject.toml --service=github finish: name: Finish Coverage Analysis needs: build From 47b06949327eb5af5a62a79a703ac8e43bdc644a Mon Sep 17 00:00:00 2001 From: Aadarsh Govada Date: Tue, 30 Jul 2024 14:19:50 -0400 Subject: [PATCH 07/11] DOC: Update zenodo.json --- .zenodo.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index 433d6dbf..b708c1df 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -50,6 +50,11 @@ { "name": "Spence, Carey", "orcid": "0000-0001-8340-5625" + }, + { + "affiliation": "Universities Space Research Association, Goddard Space Flight Center", + "name": "Govada, Aadarsh", + "orcid": "0009-0004-7873-5899" } ] } From 573830ad088b15c1f2f1b7df1c108739e10f2a53 Mon Sep 17 00:00:00 2001 From: Aadarsh Govada Date: Tue, 30 Jul 2024 14:21:34 -0400 Subject: [PATCH 08/11] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06613778..7a1ed72e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). * Allow graceful failure with no files in jhuapl load functions * New window needs to be integer for calculate_imf_steadiness * Fixed a bug where cdas_download may drop the requested end date file + * Reverted the coveralls integration to the GitHub service for MacOS runs * Documentation * Added example of how to export data for archival * Updated documentation refs From 763b105d900dad0ec17223b46f22927db1a83e11 Mon Sep 17 00:00:00 2001 From: Aadarsh-Govada <159968006+Aadarsh-Govada@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:20:32 -0400 Subject: [PATCH 09/11] MAINT: Remove cdasws version cap --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f035fe4d..3684998a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ beautifulsoup4 -cdasws<=1.8.2 +cdasws cdflib>=0.4.4 lxml netCDF4 From 8dc0ced62796a4904b11dd848e5bd7ce3724891d Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Thu, 1 Aug 2024 10:21:49 -0400 Subject: [PATCH 10/11] MAINT: fix broken link --- pysatNASA/instruments/cnofs_vefi.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pysatNASA/instruments/cnofs_vefi.py b/pysatNASA/instruments/cnofs_vefi.py index 80bfc905..5f8e9b39 100644 --- a/pysatNASA/instruments/cnofs_vefi.py +++ b/pysatNASA/instruments/cnofs_vefi.py @@ -23,9 +23,10 @@ spacecraft is to enable an accurate V x B measurement along the spacecraft trajectory. In order to provide an in-flight calibration of the magnetic field data, we compare the most recent POMME model (the POtsdam Magnetic Model of the -Earth, https://geomag.us/models/pomme5.html) with the actual magnetometer -measurements to help determine a set of calibration parameters for the gains, -offsets, and non-orthogonality matrix of the sensor axes. The calibrated +Earth, https://geomag.colorado.edu/pomme-5-magnetic-model-of-the-earth.html) +with the actual magnetometer measurements to help determine a set of calibration +parameters for the gains, offsets, and non-orthogonality matrix of the sensor +axes. The calibrated magnetic field measurements are provided in the data file here. The VEFI magnetic field data file currently contains the following variables: B_north Magnetic field in the north direction From 251831a3ecaf3d3e06134e365c85af600c671fcb Mon Sep 17 00:00:00 2001 From: Jeff Klenzing Date: Thu, 1 Aug 2024 10:22:19 -0400 Subject: [PATCH 11/11] DOC: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a1ed72e..d5fbede0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). * Added example of how to export data for archival * Updated documentation refs * Add keywords to zenodo + * Fixed broken links * Deprecations * Deprecated '' tag for de2_vefi module, support moved to de2_vefimagb * Maintenance