Merge branch 'main' of https://github.com/fortran-lang/minpack into test-refactoring

Author: jacobwilliams

.codecov.yaml

@@ -0,0 +1,7 @@
+fixes:
+  - "/home/runner/work/minpack/minpack::"
+
+ignore:
+  - "python/**/test_*.py"
+  - "test/**"
+  - "examples/**"

.github/workflows/CI.yml

@@ -10,6 +10,13 @@ jobs:
         build: [fpm, meson]
         os: [ubuntu-latest, macos-latest, windows-latest]
         gcc: [10] # Version of GFortran we want to use.
+        build-type: [debug]
+        include:
+          - build: meson
+            os: ubuntu-latest
+            gcc: 10
+            build-type: coverage
+
     defaults:
       run:
         shell: ${{ contains(matrix.os, 'windows') && 'powershell' || 'bash -l {0}' }}
@@ -61,6 +68,8 @@ jobs:
       uses: mamba-org/provision-with-micromamba@main
       with:
         environment-file: config/ci/${{ matrix.build }}-env.yaml
+        extra-specs: |
+          ${{ matrix.build-type == 'coverage' && 'gcovr' || '' }}
 
     - name: Compile (fpm)
       if: ${{ matrix.build == 'fpm' }}
@@ -80,14 +89,17 @@ jobs:
         meson setup _build
         --libdir=lib
         --prefix=${{ contains(matrix.os, 'windows') && '$pwd\_dist' || '$PWD/_dist' }}
+        ${{ matrix.build-type == 'coverage' && '-Db_coverage=true' || '' }}
 
     - name: Compile project (meson)
       if: ${{ matrix.build == 'meson' }}
       run: meson compile -C _build
 
     - name: Run testsuite (meson)
       if: ${{ matrix.build == 'meson' }}
-      run: meson test -C _build --no-rebuild --print-errorlogs
+      run: |
+        meson test -C _build --no-rebuild --print-errorlogs
+        ${{ matrix.build-type == 'coverage' && 'ninja -C _build coverage' || '' }}
 
     - name: Install project (meson)
       if: ${{ matrix.build == 'meson' }}
@@ -112,12 +124,16 @@ jobs:
         OUTPUT: minpack-${{ matrix.os }}.tar
 
     - name: Upload package
-      if: ${{ matrix.build == 'meson' }}
+      if: ${{ matrix.build == 'meson' && matrix.build-type != 'coverage' }}
       uses: actions/upload-artifact@v2
       with:
         name: ${{ env.MINPACK_OUTPUT }}
         path: ${{ env.MINPACK_OUTPUT }}
 
+    - name: Upload coverage report
+      if: ${{ matrix.build-type == 'coverage' }}
+      uses: codecov/codecov-action@v2
+
 
   Python:
     needs:
@@ -232,6 +248,9 @@ jobs:
         LD_LIBRARY_PATH: ${{ env.LD_LIBRARY_PATH }}:${{ env.MINPACK_PREFIX }}/lib
         DYLD_LIBRARY_PATH: ${{ env.DYLD_LIBRARY_PATH }}:${{ env.MINPACK_PREFIX }}/lib
 
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v2
+
 
   Docs:
     runs-on: ubuntu-latest

meson.build

@@ -8,13 +8,25 @@ project(
     'buildtype=debugoptimized',
   ],
 )
-has_cc = add_languages('c', required: get_option('python'), native: false)
+fc_nested_functions = meson.get_compiler('fortran').run(
+  'call a(); contains; subroutine a(); print "(a)", "Nested functions supported"; end; end',
+).returncode() == 0
+if fc_nested_functions
+  has_cc = add_languages('c', required: get_option('python'), native: false)
+else
+  has_cc = false
+  if get_option('python')
+    error('Cannot compile Python API, Fortran compiler does not support nested functions')
+  else
+    warning('Fortran compiler does not support nested functions, C API is disabled')
+  endif
+endif
 
 minpack_lib = library(
   meson.project_name(),
   sources: files(
     'src/minpack.f90',
-    'src/minpack_capi.f90',
+    fc_nested_functions ? 'src/minpack_capi.f90' :,
   ),
   install: true,
 )
@@ -38,9 +50,11 @@ install_data(
   install_dir: get_option('datadir')/'licenses'/meson.project_name()
 )
 
-install_headers(
-  minpack_header,
-)
+if fc_nested_functions
+  install_headers(
+    minpack_header,
+  )
+endif
 
 module_id = meson.project_name()
 meson.add_install_script(