Merge pull request #16 from nipype/new-syntax

Updates to match new pydra syntax

Author: tclose

.github/workflows/pythonpackage.yml renamed to .github/workflows/ci-cd.yml

@@ -18,40 +18,12 @@ on:
     branches: [ main ]
 
 jobs:
-  devcheck:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.7, 3.9]  # Check oldest and newest versions
-        pip-flags: ['', '--editable']
-        pydra:
-        - 'pydra'
-        - '--editable git+https://github.com/nipype/pydra.git#egg=pydra'
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install build dependencies
-      run: |
-        python -m pip install --upgrade pip
-    - name: Install Pydra
-      run: |
-        pip install ${{ matrix.pydra }}
-        python -c "import pydra as m; print(f'{m.__name__} {m.__version__} @ {m.__file__}')"
-    - name: Install task package
-      run: |
-        pip install ${{ matrix.pip-flags }} ".[dev]"
-        python -c "import pydra.tasks.$SUBPACKAGE as m; print(f'{m.__name__} {m.__version__} @ {m.__file__}')"
-        python -c "import pydra as m; print(f'{m.__name__} {m.__version__} @ {m.__file__}')"
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.11, 3.12, 3.13]
 
     steps:
     - uses: actions/checkout@v2
@@ -65,41 +37,46 @@ jobs:
     - name: Install task package
       run: |
         pip install ".[test]"
-        python -c "import pydra.tasks.$SUBPACKAGE as m; print(f'{m.__name__} {m.__version__} @ {m.__file__}')"
-        python -c "import pydra as m; print(f'{m.__name__} {m.__version__} @ {m.__file__}')"
+    - name: Install development Pydra and fileformats-medimage
+      run: |
+        pip uninstall pydra fileformats-medimage -y
+        pip install --no-deps git+https://github.com/nipype/pydra.git@new-syntax
+        pip install --no-deps git+https://github.com/arcanaframework/fileformats-medimage.git@pydra-syntax-changes
     - name: Test with pytest
       run: |
-        pytest -sv --doctest-modules pydra/tasks/$SUBPACKAGE \
-            --cov pydra.tasks.$SUBPACKAGE --cov-report xml
+        pytest -sv --cov pydra.tasks.$SUBPACKAGE --cov-report xml
     - uses: codecov/codecov-action@v1
       if: ${{ always() }}
 
-
   deploy:
-    needs: [devcheck, test]
+    needs: [test]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.9]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
         fetch-depth: 0
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+    - name: Unset header
+      # checkout@v2 adds a header that makes branch protection report errors
+      # because the Github action bot is not a collaborator on the repo
+      run: git config --local --unset http.https://github.com/.extraheader
+    - name: Set up Python
+      uses: actions/setup-python@v3
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: '3.12'
     - name: Install build tools
-      run: python -m pip install --upgrade pip setuptools wheel twine
+      run: python3 -m pip install --break-system-packages build twine
     - name: Build source and wheel distributions
-      run: python setup.py sdist bdist_wheel
+      run: python3 -m build .
     - name: Check distributions
       run: twine check dist/*
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
-        name: distributions
-        path: dist/
+        name: built
+        path: /dist
     # Deploy on tags if PYPI_API_TOKEN is defined in the repository secrets.
     # Secrets are not accessible in the if: condition [0], so set an output variable [1]
     # [0] https://github.community/t/16928

pydra/tasks/dcm2niix/__init__.py

@@ -5,9 +5,7 @@
 >>> import pydra.engine
 >>> import pydra.tasks.dcm2niix
 """
-from ._version import get_versions
 
-__version__ = get_versions()["version"]
-del get_versions
+from ._version import __version__
 
 from .utils import Dcm2Niix