TST: Try putting fortran in own directory

.github/workflows/main.yml

@@ -108,16 +108,14 @@ jobs:
     - name: Run unit and integration tests Mac/Linux
       if: ${{ matrix.os != 'windows-latest' }}
       run: |
-
+        rm -rf ./OMMBV 
         mkdir new_dir
         cd new_dir
-
-        coverage run -m pytest ../tests
+        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,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.1.0] - 2025-04-04
+## [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

MANIFEST.in

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

README.md

@@ -5,6 +5,7 @@
 
 # Orthogonal Multipole Magnetic Basis Vectors (OMMBV)
 [![Build Status](https://github.com/CosmicStudioSoftware/OMMBV/actions/workflows/main.yml/badge.svg)](https://github.com/CosmicStudioSoftware/OMMBV/actions/workflows/main.yml/badge.svg)
+[![Coverage Status](https://coveralls.io/repos/github/CosmicStudioSoftware/OMMBV/badge.svg?branch=main)](https://coveralls.io/github/CosmicStudioSoftware/OMMBV?branch=main)
 [![Documentation Status](https://readthedocs.org/projects/ommbv/badge/?version=latest)](https://ommbv.readthedocs.io/en/latest/?badge=latest)
 [![DOI](https://zenodo.org/badge/138220240.svg)](https://zenodo.org/badge/latestdoi/138220240)
 
@@ -44,7 +45,8 @@ and measurements from the Communications/Navigation Outage Forecasting System
 
 The development of the multipole software has been supported, in part, by 
 multiple agencies under the following grants:
-Naval Research Laboratory N00173-19-1-G016 and NASA 80NSSC18K1203.
+Cosmic Studio, Naval Research Laboratory N00173-19-1-G016,
+and NASA 80NSSC18K1203.
 
 Previous versions of this software that provided an 'average' basis were 
 funded by: National Aeronautics and Space Agency (NASA NNG12FA45C), 

meson.build

@@ -41,13 +41,13 @@ fortranobject_dep = declare_dependency(
 
 
 igrf_source = custom_target('igrfmodule.c',
-  input : ['OMMBV/igrf14.f'],  # .f so no F90 wrappers
+  input : ['ommbvfortran/igrf14.f'],  # .f so no F90 wrappers
   output : ['igrfmodule.c', 'igrf-f2pywrappers.f'],
   command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'igrf', '--lower']
 )
 py.extension_module('igrf',
   [
-    'OMMBV/igrf14.f',
+    'ommbvfortran/igrf14.f',
     igrf_source,
     fortranobject_c
   ],
@@ -60,14 +60,14 @@ py.extension_module('igrf',
 
 
 sources_source = custom_target('sourcesmodule.c',
-  input : ['OMMBV/sources.f', 'OMMBV/igrf14.f'],  # .f so no F90 wrappers
+  input : ['ommbvfortran/sources.f', 'ommbvfortran/igrf14.f'],  # .f so no F90 wrappers
   output : ['sourcesmodule.c', 'sources-f2pywrappers.f'],
   command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'sources', '--lower']
 )
 py.extension_module('sources',
   [
-   'OMMBV/sources.f',
-   'OMMBV/igrf14.f',
+   'ommbvfortran/sources.f',
+   'ommbvfortran/igrf14.f',
    sources_source,
    fortranobject_c
  ],
@@ -80,13 +80,13 @@ py.extension_module('sources',
 
 
 fcoords_source = custom_target('fortran_coordsmodule.c',
-  input : ['OMMBV/_coords.f'],  # .f so no F90 wrappers
+  input : ['ommbvfortran/_coords.f'],  # .f so no F90 wrappers
   output : ['fortran_coordsmodule.c', 'fortran_coords-f2pywrappers.f'],
   command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'fortran_coords', '--lower']
 )
 py.extension_module('fortran_coords',
   [
-    'OMMBV/_coords.f',
+    'ommbvfortran/_coords.f',
     fcoords_source,
     fortranobject_c
   ],

setup.py

@@ -22,14 +22,15 @@
                   '-Wno-unused-variable', '-Wno-maybe-uninitialized',
                   '-Wno-unused-dummy-argument']
     extensions = [Extension(name='OMMBV.igrf',
-                            sources=[os.path.join('OMMBV', 'igrf14.f')],
+                            sources=[os.path.join('ommbvfortran', 'igrf14.f')],
                             extra_f77_compile_args=extra_args),
                   Extension(name='OMMBV.sources',
-                            sources=[os.path.join('OMMBV', 'sources.f'),
-                                     os.path.join('OMMBV', 'igrf14.f')],
+                            sources=[os.path.join('ommbvfortran', 'sources.f'),
+                                     os.path.join('ommbvfortran', 'igrf14.f')],
                             extra_f77_compile_args=extra_args),
                   Extension(name='OMMBV.fortran_coords',
-                            sources=[os.path.join('OMMBV', '_coords.f')])]
+                            sources=[os.path.join('ommbvfortran',
+                                                  '_coords.f')])]
 
 setup_kwargs = {'ext_modules': extensions}
 setup(**setup_kwargs)

tests/test_core.py

@@ -8,9 +8,9 @@
 import pytest
 import warnings
 
+import pysat
+
 import OMMBV
-import tests
-import tests.test_deprecation as testing
 import OMMBV.trace
 import OMMBV.trans
 import OMMBV.vector
@@ -348,7 +348,7 @@ def test_nonconvergence_basis_ecef(self):
         assert len(war) >= len(self.warn_msgs)
 
         # Test the warning messages, ensuring each attribute is present.
-        testing.eval_warnings(war, self.warn_msgs, RuntimeWarning)
+        pysat.utils.testing.eval_warnings(war, self.warn_msgs, RuntimeWarning)
 
         return
 

tests/test_former_methods.py

@@ -4,7 +4,7 @@
 
 import OMMBV
 import OMMBV.heritage
-from tests.test_core import gen_plot_grid_fixed_alt
+from test_core import gen_plot_grid_fixed_alt
 import OMMBV.vector
 
 

tests/test_trace.py

@@ -5,7 +5,7 @@
 import numpy as np
 import pytest
 
-from tests.test_core import gen_data_fixed_alt
+from test_core import gen_data_fixed_alt
 import OMMBV.trans
 import OMMBV.trace as trace
 

tests/test_trans.py

@@ -6,7 +6,7 @@
 from OMMBV import igrf
 from OMMBV import sources
 import OMMBV.trans
-from tests.test_core import gen_data_fixed_alt
+from test_core import gen_data_fixed_alt
 
 
 # ############## TRANSFORMATIONS ############## #

tests/test_vector.py

@@ -5,7 +5,7 @@
 
 import OMMBV
 from OMMBV import sources
-from tests.test_core import gen_data_fixed_alt
+from test_core import gen_data_fixed_alt
 
 
 class TestVector(object):