Merge branch 'main' into fix/no_mutate_on_run

effigies · web-flow · commit 1df2696fa9fb · 2024-05-20T10:27:08.000-04:00
diff --git a/.coveragerc b/.coveragerc
@@ -2,4 +2,8 @@
 branch = True
 omit =
     */_version.py
-    */tests/*
+
+[paths]
+source =
+    pydra/tasks
+    /**/pydra/tasks
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -7,6 +7,7 @@ name: Python package
 env:
   SUBPACKAGE: nipype1
   FSLCONDA: https://fsl.fmrib.ox.ac.uk/fsldownloads/fslconda/public/
+  NO_ET: 1  # etelemetry causes order-of-magnitude slowdowns
 
 on:
   push:
@@ -86,8 +87,8 @@ jobs:
           python -c "import pydra as m; print(f'{m.__name__} {m.__version__} @ {m.__file__}')"
       - name: Test with pytest
         run: |
-          pytest -sv --doctest-modules pydra/tasks/$SUBPACKAGE \
-              --cov pydra.tasks.$SUBPACKAGE --cov-report xml
+          pytest -sv --doctest-modules --pyargs pydra.tasks.$SUBPACKAGE \
+              --cov pydra.tasks.$SUBPACKAGE --cov-report xml --cov-report term-missing
       - uses: codecov/codecov-action@v4
         if: ${{ always() }}
         with:
diff --git a/codecov.yml b/codecov.yml
@@ -1,10 +1,7 @@
 coverage:
   range: "50...100"
   ignore:          # files and folders that will be removed during processing
-    - "**/tests"
     - "**/_version.py"
-    - "setup.py"
-    - "versioneer.py"
   status:
     project:
       default:
diff --git a/pydra/tasks/nipype1/__init__.py b/pydra/tasks/nipype1/__init__.py
@@ -5,8 +5,8 @@
 
 try:
     from ._version import __version__
-except ImportError:
-    pass
+except ImportError:  # pragma: no cover
+    __version__ = "0+unknown"
 
 from .utils import Nipype1Task
 
