From 52727ba7da659d1450178af37606657bcc739236 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 7 Sep 2022 15:52:13 -0400 Subject: [PATCH 1/3] No neurodebian -devel in crippledfs and extensions --- .github/workflows/test_crippled.yml | 4 ++-- .github/workflows/test_extensions.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_crippled.yml b/.github/workflows/test_crippled.yml index 465c474a6f..082dcb4316 100644 --- a/.github/workflows/test_crippled.yml +++ b/.github/workflows/test_crippled.yml @@ -11,8 +11,8 @@ jobs: shell: bash run: | bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh) - # enable repo for devel git-annex - sudo sed -e 's|\(deb.*data\)|#\1|' -e 's|/debian |/debian-devel |' /etc/apt/sources.list.d/neurodebian.sources.list | sudo tee /etc/apt/sources.list.d/neurodebian-devel.sources.list + # enable repo for devel git-annex if needed + # sudo sed -e 's|\(deb.*data\)|#\1|' -e 's|/debian |/debian-devel |' /etc/apt/sources.list.d/neurodebian.sources.list | sudo tee /etc/apt/sources.list.d/neurodebian-devel.sources.list sudo apt-get update -qq sudo apt-get install eatmydata sudo eatmydata apt-get install git-annex-standalone dosfstools diff --git a/.github/workflows/test_extensions.yml b/.github/workflows/test_extensions.yml index 164aaeb668..9c52a8575c 100644 --- a/.github/workflows/test_extensions.yml +++ b/.github/workflows/test_extensions.yml @@ -23,7 +23,8 @@ jobs: shell: bash run: | bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh) - sudo sed -i-devel.list -e 's,/debian ,/debian-devel ,g' /etc/apt/sources.list.d/neurodebian.sources.list + # enable in case -devel version is needed + # sudo sed -i-devel.list -e 's,/debian ,/debian-devel ,g' /etc/apt/sources.list.d/neurodebian.sources.list sudo apt-get update -qq sudo apt-get install eatmydata sudo eatmydata apt-get install git-annex-standalone From 45231d5a31c0bee0fa4b5a12b1b6dc210d39a012 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 7 Sep 2022 15:53:47 -0400 Subject: [PATCH 2/3] ENH: add -next to be tested among extensions --- .github/workflows/test_extensions.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test_extensions.yml b/.github/workflows/test_extensions.yml index 9c52a8575c..8ff785bc3d 100644 --- a/.github/workflows/test_extensions.yml +++ b/.github/workflows/test_extensions.yml @@ -16,6 +16,7 @@ jobs: datalad-metalad, datalad-crawler, datalad-deprecated, + datalad-next, ] steps: @@ -65,6 +66,8 @@ jobs: DL_TESTER=pytest;; datalad-container) DL_NEED_SINGULARITY=1;; + datalad-next) + DL_TESTER=pytest;; esac { echo "DL_PIP_INSTALLS=$DL_PIP_INSTALLS" From e0e3159b904bf27e0f1c6964f08c6cd51fa9196d Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 7 Sep 2022 16:34:37 -0400 Subject: [PATCH 3/3] Create empty tox.ini if extension (such as -next) has none --- .github/workflows/test_extensions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_extensions.yml b/.github/workflows/test_extensions.yml index 8ff785bc3d..8a72eb6b4c 100644 --- a/.github/workflows/test_extensions.yml +++ b/.github/workflows/test_extensions.yml @@ -108,8 +108,8 @@ jobs: cd __testhome__ # -crawler's tox.ini points to itself (but without full path) for coverage # configuration. So far attempts to "fix" by somehow providing full path did not work. - # That is why just symlink it here. - ln -s ../__extension__/tox.ini . + # That is why just symlink it here. If no tox.ini -- create an empty one + [ -e ../__extension__/tox.ini ] && ln -s ../__extension__/tox.ini . || touch tox.ini python -m pytest -c ./tox.ini -s -v --cov=datalad --pyargs ${DL_PACKAGE} if: env.DL_TESTER == 'pytest'