Merge pull request #10 from datalad/force-py3

Force python3 for datalad-installer
datalad · Aug 30, 2022 · e73e82c · e73e82c
2 parents d4f3953 + fdae682
commit e73e82c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/test-action.yaml b/.github/workflows/test-action.yaml
@@ -32,7 +32,7 @@ jobs:
         with:
           source: https://github.com/psychoinformatics-de/studyforrest-data-phase2
       - name: Show Result
-        run: tree .
+        run: find .
       - name: Test Result
         run: |
           [ -e studyforrest-data-phase2 ]
@@ -58,9 +58,14 @@ jobs:
           [ -e dataset ]
           [ -e dataset/sub-22/sub-22_task-movie_beh.json ]
           [ -e dataset/sub-23/sub-23_task-movie_beh.json ]
+        run: find .
 
   dataset-get-cache:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-20.04, macos-10.15, ubuntu-latest, macos-latest ]
     name: Install Datalad, Get and Cache
     steps:
       - name: Checkout
@@ -70,7 +75,7 @@ jobs:
         with:
           source: https://github.com/psychoinformatics-de/studyforrest-data-phase2
       - name: Show Result
-        run: tree .
+        run: find .
       - name: Cache Dataset
         uses: actions/cache@v3
         with:
@@ -89,11 +94,11 @@ jobs:
           branch: debian
           source: https://github.com/psychoinformatics-de/studyforrest-data-phase2
       - name: Show Result
-        run: tree .
+        run: find .
       - name: Test Result
         run: |
           [ -e studyforrest-data-phase2 ]
-  
+
   install-datalad-branch:
     runs-on: ubuntu-latest
     name: Install Datalad via Branch

diff --git a/get/scripts/get.sh b/get/scripts/get.sh
@@ -19,15 +19,11 @@ istrue() {
     echo "$@" | grep -q -i -e '^true$'
 }
 
-# set -x  # to ease debugging etc
+# Ensure git annex added to path
+echo "$CONDA/bin" >> "${GITHUB_PATH}"
+export PATH=$CONDA/bin:$PATH
 
-# to ease debugging locally -- if no GITHUB_PATH, do not bother
-if [ -n "${GITHUB_PATH}" ]; then
-    # Ensure git annex added to path
-    echo "/usr/share/miniconda/bin" >> "${GITHUB_PATH}"
-    ls /usr/share/miniconda/bin
-    export PATH="/usr/share/miniconda/bin:$PATH"
-fi
+# set -x  # to ease debugging etc
 
 # compose command depending on the available options
 #

diff --git a/install/scripts/install.sh b/install/scripts/install.sh
@@ -17,17 +17,18 @@ echo "install_root: ${install_root}"
 git config --global --add user.name "${user}"
 git config --global --add user.email  "${email}"
 
-python -m pip install --upgrade pip
+python3 -m pip install --upgrade pip
 
 # Install git annex
-pip install datalad-installer
+python3 -m pip install datalad-installer
+
 datalad-installer git-annex
 git config --global filter.annex.process "git-annex filter-process"
 
 # Ensure git annex added to path
 # Datalad needs to be installed to this conda environment
-echo "/usr/share/miniconda/bin" >> "${GITHUB_PATH}"
-export PATH="/usr/share/miniconda/bin:$PATH"
+echo "$CONDA/bin" >> "${GITHUB_PATH}"
+export PATH="$CONDA/bin:$PATH"
 command -v pip
 
 # Do we have a release or a branch?