Skip to content

Commit fbf4676

Browse files
authored
Merge pull request #237 from pysat/cover
BUG: Revert integration to GitHub service for coveralls on MacOS
2 parents 93924dd + c20ab63 commit fbf4676

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,19 @@ jobs:
5252
python setup.py develop
5353
cd ../pysatNASA
5454
pip install .
55-
5655
- name: Install NEP29 dependencies
5756
if: ${{ matrix.test_config == 'NEP29'}}
5857
run: |
5958
pip install numpy==${{ matrix.numpy_ver }}
6059
pip install --upgrade-strategy only-if-needed .[test]
61-
6260
- name: Install standard dependencies
6361
if: ${{ matrix.test_config == 'latest'}}
6462
run: |
6563
pip install .[test]
66-
6764
- name: Set up pysat
6865
run: |
6966
mkdir pysatData
7067
python -c "import pysat; pysat.params['data_dirs'] = 'pysatData'"
71-
7268
- name: Test PEP8 compliance
7369
run: flake8 . --count --select=D,E,F,H,W --show-source --statistics
7470

@@ -86,7 +82,6 @@ jobs:
8682
run: |
8783
curl -sL https://coveralls.io/coveralls-linux.tar.gz | tar -xz
8884
./coveralls report --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }}
89-
9085
- name: Coveralls Parallel (Windows)
9186
if: startsWith(matrix.os, 'windows')
9287
env:
@@ -95,19 +90,13 @@ jobs:
9590
run: |
9691
curl -L https://github.com/coverallsapp/coverage-reporter/releases/latest/download/coveralls-windows.exe -o coveralls.exe
9792
./coveralls.exe report --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }}
98-
99-
- name: Coveralls Parallel (MacOS)
93+
- name: Publish results to coveralls (MacOS)
10094
if: startsWith(matrix.os, 'macos')
10195
env:
10296
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
10397
COVERALLS_PARALLEL: true
10498
run: |
105-
brew tap coverallsapp/coveralls --quiet
106-
brew install coveralls --quiet
107-
ls -lh .coverage
108-
ls -lh coverage.xml
109-
coveralls report coverage.xml --format=cobertura --verbose --parallel --repo-token=${{ secrets.COVERALLS_REPO_TOKEN }} --build-number ${{ github.run_number }} --debug --dry-run
110-
99+
coveralls --rcfile=pyproject.toml --service=github
111100
finish:
112101
name: Finish Coverage Analysis
113102
needs: build
@@ -120,4 +109,4 @@ jobs:
120109
COVERALLS_PARALLEL: true
121110
run: |
122111
curl -sL https://coveralls.io/coveralls-linux.tar.gz | tar -xz
123-
./coveralls done --build-number ${{ github.run_number }}
112+
./coveralls done --build-number ${{ github.run_number }}

.zenodo.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@
5050
{
5151
"name": "Spence, Carey",
5252
"orcid": "0000-0001-8340-5625"
53+
},
54+
{
55+
"affiliation": "Universities Space Research Association, Goddard Space Flight Center",
56+
"name": "Govada, Aadarsh",
57+
"orcid": "0009-0004-7873-5899"
5358
}
5459
]
5560
}

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ This project adheres to [Semantic Versioning](https://semver.org/).
2323
* Allow graceful failure with no files in jhuapl load functions
2424
* New window needs to be integer for calculate_imf_steadiness
2525
* Fixed a bug where cdas_download may drop the requested end date file
26+
* Reverted the coveralls integration to the GitHub service for MacOS runs
2627
* Fixed a bug where cdas_list_remote_files errored without remote data
2728
* Documentation
2829
* Added example of how to export data for archival
2930
* Updated documentation refs
3031
* Add keywords to zenodo
32+
* Fixed broken links
3133
* Deprecations
3234
* Deprecated '' tag for de2_vefi module, support moved to de2_vefimagb
3335
* Maintenance

pysatNASA/instruments/cnofs_vefi.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
spacecraft is to enable an accurate V x B measurement along the spacecraft
2424
trajectory. In order to provide an in-flight calibration of the magnetic field
2525
data, we compare the most recent POMME model (the POtsdam Magnetic Model of the
26-
Earth, https://geomag.us/models/pomme5.html) with the actual magnetometer
27-
measurements to help determine a set of calibration parameters for the gains,
28-
offsets, and non-orthogonality matrix of the sensor axes. The calibrated
26+
Earth, https://geomag.colorado.edu/pomme-5-magnetic-model-of-the-earth.html)
27+
with the actual magnetometer measurements to help determine a set of calibration
28+
parameters for the gains, offsets, and non-orthogonality matrix of the sensor
29+
axes. The calibrated
2930
magnetic field measurements are provided in the data file here. The VEFI
3031
magnetic field data file currently contains the following variables:
3132
B_north Magnetic field in the north direction

0 commit comments

Comments
 (0)