Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1919947
Merge pull request #57 from rstoneback/develop
rstoneback Jan 4, 2022
30be10a
ENH: Updated release date to go with RC creation
rstoneback Apr 4, 2025
ccf2c33
DOC: Added updated documentation to changelog
rstoneback Apr 4, 2025
17f980e
TST: Debugging unit testing reporting
rstoneback Apr 4, 2025
24ba222
TST: Try putting fortran in own directory
rstoneback Apr 4, 2025
7deff53
TST: Try putting fortran in own directory
rstoneback Apr 4, 2025
bd0657b
TST: Try putting fortran in own directory
rstoneback Apr 4, 2025
2acf3fe
TST: Try putting fortran in own directory
rstoneback Apr 4, 2025
3c8255f
TST: Try removing init
rstoneback Apr 4, 2025
823eeec
TST: Try different dir setup
rstoneback Apr 4, 2025
a094c58
TST: Try different dir setup
rstoneback Apr 4, 2025
28567f3
TST: Try different dir setup
rstoneback Apr 4, 2025
6ae7e56
TST: Try not importing tests
rstoneback Apr 4, 2025
7c49e92
TST: Tweaking commands, but tests run, no coverage
rstoneback Apr 4, 2025
3f49fd5
TST: Tweaking commands, but tests run, no coverage
rstoneback Apr 4, 2025
7330f3d
TST: Try out github actions
rstoneback Apr 4, 2025
720f7ed
TST: Try out github actions
rstoneback Apr 4, 2025
3100982
TST: Try out get real coverage
rstoneback Apr 4, 2025
9060553
TST: Try out get real coverage
rstoneback Apr 4, 2025
bcaf5e3
TST: Try to get real coverage
rstoneback Apr 4, 2025
6de9088
TST: Try to get real coverage
rstoneback Apr 4, 2025
982dda6
TST: Try to get real coverage
rstoneback Apr 4, 2025
fabee9f
TST: Try to get real coverage
rstoneback Apr 4, 2025
09335d6
TST: Try to get real coverage
rstoneback Apr 4, 2025
45d06bb
TST: Try to get real coverage
rstoneback Apr 4, 2025
39f8c39
TST: Omit __init__ from reporting
rstoneback Apr 5, 2025
c63d9e4
TST: Omit __init__ from reporting
rstoneback Apr 5, 2025
e9861ed
ENH: Update fortran code locations for old setup
rstoneback Apr 5, 2025
b46689f
ENH: Remove old IGRF version
rstoneback Apr 5, 2025
25e0548
ENH: Update old manifest
rstoneback Apr 5, 2025
74605e5
ENH: Update changelog
rstoneback Apr 5, 2025
db68715
ENH: Restore coverage percentage
rstoneback Apr 5, 2025
49868ce
ENH: Restore coverage percentage
rstoneback Apr 5, 2025
a2435ca
BUG: PEP8
rstoneback Apr 5, 2025
cbbac3e
Merge pull request #66 from CosmicStudioSoftware/test_moving_fortran
rstoneback Apr 5, 2025
2c14342
DOC: Updated citation
rstoneback Apr 5, 2025
a73594c
BUG: Removed old commented and unneeded code
rstoneback Apr 5, 2025
241f79d
DOC: Update version
rstoneback Apr 5, 2025
3568ee1
BUG: Deleted commented code
rstoneback Apr 5, 2025
728e9de
DOC: Updated changelog
rstoneback Apr 5, 2025
69a7631
DOC: Updated changelog
rstoneback Apr 7, 2025
e1bcd49
Merge pull request #65 from CosmicStudioSoftware/v1.1.0-RC
rstoneback Apr 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,11 @@ jobs:
rm -rf ./OMMBV
mkdir new_dir
cd new_dir

coverage run -m pytest ../
coverage run -m --source=OMMBV --omit=__init__.py pytest ../tests
coverage report
coverage xml
ls
cp coverage.xml ../coverage.xml
cat coverage.xml
mkdir ../OMMBV
mv coverage.xml ../OMMBV/coverage.xml

- name: Run unit and integration tests on Windows
if: ${{ matrix.os == 'windows-latest' }}
Expand All @@ -130,20 +128,22 @@ jobs:
coverage xml
mv coverage.xml .\OMMBV\.

- name: Publish results to coveralls
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_PARALLEL: true
run: coveralls --service=github --verbose
- name: Publish results to coveralls upon success
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
flag-name: run=${{ join(matrix.*, '-') }}
parallel: true
format: cobertura

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 --verbose
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.1.0] - ?????
## [1.1.0] - 2025-04-07
- Switched away from distutils to Meson for build system
- Updated coupling to coveralls
- Updated package version for security issue in sphinx
- Added online unit testing for Linux and MacOS
- Updated online unit testing
- Updated to IGRF14
- Updated documentation
- Updated unit tests to latest standards

## [1.0.1] - 2022-01-04
- Added pyproject.toml to support systems without numpy.
Expand Down
4 changes: 3 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include LICENSE
include CONTRIBUTING.md
include CHANGELOG.md
include OMMBV/version.txt
include meson.build
include README.md
2 changes: 1 addition & 1 deletion OMMBV/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""init routine for OMMBV."""

__version__ = '1.0.2'
__version__ = '1.1.0'

try:
from OMMBV import igrf
Expand Down
24 changes: 0 additions & 24 deletions OMMBV/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,6 @@ def calculate_mag_drift_unit_vectors_ecef(latitude, longitude, altitude,
ecef_x, ecef_y, ecef_z = trans.geodetic_to_ecef(latitude, longitude,
altitude)

# This shouldn't have been pushed to the repo
# idx, = np.where(np.isnan(ecef_x))
# if len(idx) > 0:
# print("Encountered nan starting ecef locations ", ecef_x[idx],
# ecef_y[idx], ecef_z[idx], latitude[idx], longitude[idx],
# altitude[idx])

# Begin method calculation.

# Magnetic field at root location
Expand Down Expand Up @@ -358,13 +351,6 @@ def calculate_mag_drift_unit_vectors_ecef(latitude, longitude, altitude,
ecef_input=True,
**step_kwargs)

# This shouldn't be here
# idx, = np.where(np.isnan(tzx))
# if len(idx) > 0:
# print("Encountered nan tzx values ", idx, ecef_x[idx],
# ecef_y[idx], ecef_z[idx], tzx[idx], tzy[idx], tzz[idx],
# latitude[idx], longitude[idx], altitude[idx])

if centered_diff:
# Negative step
ecef_xz2, ecef_yz2, ecef_zz2 = (ecef_x - step_size * tzx,
Expand Down Expand Up @@ -435,15 +421,6 @@ def calculate_mag_drift_unit_vectors_ecef(latitude, longitude, altitude,
& (loop_num + 1 >= min_loops):
# Reached terminating conditions
repeat_flag = False
# print('Using position ', location_info(ecef_xz, ecef_yz, ecef_zz,
# datetimes,
# return_geodetic=True,
# ecef_input=True,
# **step_kwargs)[3:], loop_num)
# idx, = np.where(np.isnan(ecef_xz))
# if len(idx) > 0:
# print("Encountered nan apex locations ", ecef_xz[idx],
# ecef_yz[idx], ecef_zz[idx])
else:
# Store info into calculation vectors to refine next loop
tzx, tzy, tzz = tzx2, tzy2, tzz2
Expand Down Expand Up @@ -691,7 +668,6 @@ def step_along_mag_unit_vector(x, y, z, date, direction, num_steps=1,

if direction == 'meridional':
centered_diff = True
# print("False")
else:
centered_diff = False

Expand Down
Loading