From 04d4b01b7565a06920f0aefb21977dccad458156 Mon Sep 17 00:00:00 2001 From: Tom Close Date: Tue, 21 May 2024 17:38:17 +1000 Subject: [PATCH 1/3] avoid deleting version file when you regenerating auto-converted files --- nipype2pydra/cli/convert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype2pydra/cli/convert.py b/nipype2pydra/cli/convert.py index a50c27e..e7504fa 100644 --- a/nipype2pydra/cli/convert.py +++ b/nipype2pydra/cli/convert.py @@ -69,7 +69,7 @@ def convert( shutil.rmtree(package_dir / "auto") else: for fspath in package_dir.iterdir(): - if fspath == package_dir / "__init__.py": + if fspath in (package_dir / "__init__.py", package_dir / "_version.py"): continue if fspath.is_dir(): shutil.rmtree(fspath) From 38dec4cc705d62e03a8588e2d1412c220d66f583 Mon Sep 17 00:00:00 2001 From: Tom Close Date: Tue, 21 May 2024 19:10:00 +1000 Subject: [PATCH 2/3] changed the python versions --- .github/workflows/ci-cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 02d8ca6..42ba5e8 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -37,7 +37,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest] - python-version: ["3.8", "3.11"] + python-version: ["3.8", "3.12"] fail-fast: false runs-on: ${{ matrix.os }} defaults: @@ -120,7 +120,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' - name: Install build tools run: python3 -m pip install --break-system-packages build twine From cb66d059d2b4799327dbb30d3ea665a992d8ff08 Mon Sep 17 00:00:00 2001 From: Tom Close Date: Fri, 24 May 2024 14:04:42 +1000 Subject: [PATCH 3/3] removed xfail --- nipype2pydra/tests/test_package.py | 1 - 1 file changed, 1 deletion(-) diff --git a/nipype2pydra/tests/test_package.py b/nipype2pydra/tests/test_package.py index fbbebbb..daf1094 100644 --- a/nipype2pydra/tests/test_package.py +++ b/nipype2pydra/tests/test_package.py @@ -52,7 +52,6 @@ def package_spec(request): return EXAMPLE_PKG_GEN_DIR / f"{request.param}.yaml" -@pytest.mark.xfail(reason="Don't have time to debug at the moment") def test_package_complete(package_spec, cli_runner, tmp_path, tasks_template_args): pkg_name = package_spec.stem repo_output = tmp_path / "repo"