From a7ff7ea13bc430155a9f42f05a4e8e31790e13ec Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 16 Aug 2022 14:44:01 -0400 Subject: [PATCH 1/2] Install entire [devel] so we install psutil etc Taken from https://github.com/datalad/git-annex/pull/75/commits/4fd1be9a04b5345ec266ae0910311b786919a0c4 which back then failed to test on windows... may be this time would be better. But the main goal is to get psutil to get "filesystems" in hte WTF output to troubleshoot https://github.com/datalad/datalad/issues/6901 --- .github/workflows/template/build-{{ostype}}.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index 276f659463..526793c474 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -719,9 +719,9 @@ jobs: commitish="${{ matrix.version }}" fi python -m pip install --upgrade pip - pip install git+https://github.com/datalad/datalad@${commitish} + pip install datalad[devel]@git+https://github.com/datalad/datalad@${commitish} - - name: Install nose et al (just in case!) + - name: Install pytest et al (just in case!) run: pip install nose pytest vcrpy mock - name: WTF!? From 947a23b7156188b17349e9534379f6e9c886ebf8 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 16 Aug 2022 14:46:19 -0400 Subject: [PATCH 2/2] [DATALAD RUNCMD] update files from template === Do not change lines below === { "chain": [], "cmd": "make", "exit": 0, "extra_inputs": [], "inputs": [], "outputs": [], "pwd": ".github/workflows/template" } ^^^ Do not change lines above ^^^ --- .github/workflows/build-macos.yaml | 4 ++-- .github/workflows/build-ubuntu.yaml | 4 ++-- .github/workflows/build-windows.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 1e4ddaca88..b0c05c2889 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -414,9 +414,9 @@ jobs: commitish="${{ matrix.version }}" fi python -m pip install --upgrade pip - pip install git+https://github.com/datalad/datalad@${commitish} + pip install datalad[devel]@git+https://github.com/datalad/datalad@${commitish} - - name: Install nose et al (just in case!) + - name: Install pytest et al (just in case!) run: pip install nose pytest vcrpy mock - name: WTF!? diff --git a/.github/workflows/build-ubuntu.yaml b/.github/workflows/build-ubuntu.yaml index ff7091ea1d..3c2fa2c84f 100644 --- a/.github/workflows/build-ubuntu.yaml +++ b/.github/workflows/build-ubuntu.yaml @@ -468,9 +468,9 @@ jobs: commitish="${{ matrix.version }}" fi python -m pip install --upgrade pip - pip install git+https://github.com/datalad/datalad@${commitish} + pip install datalad[devel]@git+https://github.com/datalad/datalad@${commitish} - - name: Install nose et al (just in case!) + - name: Install pytest et al (just in case!) run: pip install nose pytest vcrpy mock - name: WTF!? diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index 9a61a8e73d..42132fb34a 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -408,9 +408,9 @@ jobs: commitish="${{ matrix.version }}" fi python -m pip install --upgrade pip - pip install git+https://github.com/datalad/datalad@${commitish} + pip install datalad[devel]@git+https://github.com/datalad/datalad@${commitish} - - name: Install nose et al (just in case!) + - name: Install pytest et al (just in case!) run: pip install nose pytest vcrpy mock - name: WTF!?