Merge pull request #67 from CosmicStudioSoftware/main

Merge release back into develop

Author: rstoneback

.github/workflows/main.yml

@@ -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' }}
@@ -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

CHANGELOG.md

@@ -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.

MANIFEST.in

@@ -1,3 +1,5 @@
 include LICENSE
-include CONTRIBUTING.md
+include CHANGELOG.md
 include OMMBV/version.txt
+include meson.build
+include README.md

OMMBV/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """init routine for OMMBV."""
 
-__version__ = '1.0.2'
+__version__ = '1.1.0'
 
 try:
     from OMMBV import igrf

OMMBV/_core.py

@@ -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
@@ -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,
@@ -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
@@ -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