Skip to content

Commit 959eaf6

Browse files
authored
Merge pull request #25 from nipype/new-syntax
Updates Nipype2Pydra so that it generates new Pydra syntax
2 parents dc9fe56 + 552a6b6 commit 959eaf6

File tree

687 files changed

+10060
-79145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

687 files changed

+10060
-79145
lines changed

.github/workflows/ci-cd.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
strategy:
3838
matrix:
3939
os: [macos-latest, ubuntu-latest]
40-
python-version: ["3.8", "3.11"]
40+
python-version: ["3.11", "3.13"]
4141
fail-fast: false
4242
runs-on: ${{ matrix.os }}
4343
defaults:
@@ -77,25 +77,35 @@ jobs:
7777
with:
7878
python-version: ${{ matrix.python-version }}
7979

80-
- name: Update build tools
81-
run: python3 -m pip install --break-system-packages --upgrade pip setuptools wheel
80+
- name: Create virtual environment
81+
run: python3 -m venv venv
82+
83+
- name: Activate virtual environment and update build tools
84+
run: |
85+
source venv/bin/activate
86+
python -m pip install --upgrade pip setuptools wheel
8287
8388
- name: Install required file-formats packages
8489
run: |
90+
source venv/bin/activate
8591
pushd required-fileformats
86-
python3 -m pip install --break-system-packages -r requirements.txt
92+
python -m pip install -r requirements.txt
8793
popd
8894
8995
- name: Install Dipy separately as it was causing trouble
90-
run: python3 -m pip install --break-system-packages dipy
96+
run: |
97+
source venv/bin/activate
98+
python -m pip install dipy
9199
92100
- name: Install Package
93-
run: python3 -m pip install --break-system-packages .[test]
101+
run: |
102+
source venv/bin/activate
103+
python -m pip install .[test]
94104
95105
- name: Pytest
96-
run: >-
97-
NIPYPE2PYDRA_PYDRA_TASK_TEMPLATE=$PWD/pydra-tasks-template
98-
pytest -vvs --cov nipype2pydra --cov-config .coveragerc --cov-report xml
106+
run: |
107+
source venv/bin/activate
108+
NIPYPE2PYDRA_PYDRA_TASK_TEMPLATE=$PWD/pydra-tasks-template pytest -vvs --cov nipype2pydra --cov-config .coveragerc --cov-report xml
99109
100110
- name: Upload coverage to Codecov
101111
uses: codecov/codecov-action@v2
@@ -123,7 +133,7 @@ jobs:
123133
python-version: '3.11'
124134

125135
- name: Install build tools
126-
run: python3 -m pip install --break-system-packages build twine
136+
run: python3 -m pip install build twine
127137

128138
- name: Build source and wheel distributions
129139
run: python3 -m build .

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ __pycache__
2222
/outputs
2323
/test-data
2424
/nipype2pydra/_version.py
25-
25+
/required-fileformats/**/_version.py

0 commit comments

Comments
 (0)