Merge pull request #519 from nipype/CI/tests_updates

updating test pydra GA

Author: djarecka

.github/workflows/testpydra.yml

@@ -1,6 +1,11 @@
 name: Pydra
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
 
 defaults:
   run:
@@ -11,8 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
-        install: [install, develop, wheel]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
@@ -26,27 +30,13 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Update build tools
-      run: python -m pip install --upgrade pip setuptools
-
-
-    - name: Install Pydra tests dependencies (develop or setup.py install)
-      if: matrix.install == 'develop' || matrix.install == 'install'
-      run: pip install ".[test]"
-
-
-    - name: Install dependencies (setup.py install)
-      if: matrix.install == 'install'
-      run: python setup.py install
+      run: python -m pip install --upgrade pip build
 
-    - name: Install dependencies (wheel)
-      if: matrix.install == 'wheel'
-      run: |
-        python setup.py bdist_wheel
-        pip install dist/*.whl
+    - name: Build pydra
+      run: python -m build
 
 
-    - name: Install Pydra tests dependencies (wheel)
-      if: matrix.install == 'wheel'
+    - name: Install Pydra tests dependencies
       run: pip install "$( ls dist/pydra*.whl )[test]"
 
 

.github/workflows/testsingularity.yml

@@ -1,14 +1,18 @@
 name: Singularity
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
       fail-fast: False
 
     steps:

.github/workflows/testslurm.yml

@@ -1,6 +1,10 @@
 name: SLURM
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   build:

pydra/engine/task.py

@@ -159,8 +159,8 @@ def __init__(
                 return_info = func.__annotations__["return"]
                 # e.g. python annotation: fun() -> ty.NamedTuple("Output", [("out", float)])
                 # or pydra decorator: @pydra.mark.annotate({"return": ty.NamedTuple(...)})
-                if hasattr(return_info, "__name__") and hasattr(
-                    return_info, "__annotations__"
+                if hasattr(return_info, "__name__") and getattr(
+                    return_info, "__annotations__", None
                 ):
                     name = return_info.__name__
                     fields = list(return_info.__annotations__.items())

setup.cfg

@@ -30,7 +30,7 @@ install_requires =
     etelemetry >= 0.2.2
 
 test_requires =
-    pytest >= 4.4.0, < 6.0.0
+    pytest >= 6.2.5
     pytest-cov
     pytest-env
     pytest-xdist < 2.0
@@ -64,7 +64,7 @@ doc =
 docs =
     %(doc)s
 test =
-    pytest >= 4.4.0, < 6.0.0
+    pytest >= 6.2.5
     pytest-cov
     pytest-env
     pytest-xdist < 2.0