From 735ca58416eec2dc0329a7c92b0364a537abd492 Mon Sep 17 00:00:00 2001 From: Jerome Dockes Date: Thu, 21 Sep 2023 11:19:04 +0200 Subject: [PATCH 1/7] use pytest rather than python -m pytest --- build_tools/github/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/github/test.sh b/build_tools/github/test.sh index 618cfbf44..b3b2f9222 100755 --- a/build_tools/github/test.sh +++ b/build_tools/github/test.sh @@ -1,3 +1,3 @@ #!/bin/bash -x -python -m pytest --pyargs skrub --cov=skrub -n auto +pytest --pyargs skrub --cov=skrub -n auto From 153d23588c91bb38684574d9be9cda048a83e6b9 Mon Sep 17 00:00:00 2001 From: Jerome Dockes Date: Thu, 21 Sep 2023 14:12:10 +0200 Subject: [PATCH 2/7] run tests in temp dir --- .github/workflows/testing.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 980fccb1c..b3968c55b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -71,11 +71,13 @@ jobs: env: DEPS_VERSION: ${{ matrix.dependencies-version }} - shell: bash {0} - run: ./build_tools/github/test.sh + run: ${{ github.workspace }}/build_tools/github/test.sh + working-directory: ${{ runner.temp }} name: 'Run tests' - uses: codecov/codecov-action@v3 if: success() name: 'Upload coverage to CodeCov' + directory: ${{ runner.temp }} run_nightly: runs-on: ubuntu-latest From 64d37f9d29b2c79503bdb8a2c659187824d9dbbd Mon Sep 17 00:00:00 2001 From: Jerome Dockes Date: Thu, 21 Sep 2023 14:15:11 +0200 Subject: [PATCH 3/7] fix codecov action --- .github/workflows/testing.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index b3968c55b..4e520a0d4 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -75,9 +75,10 @@ jobs: working-directory: ${{ runner.temp }} name: 'Run tests' - uses: codecov/codecov-action@v3 + with: + directory: ${{ runner.temp }} if: success() name: 'Upload coverage to CodeCov' - directory: ${{ runner.temp }} run_nightly: runs-on: ubuntu-latest From 2f2e1d10aafeae2625746cf5d2dd6469e65752a9 Mon Sep 17 00:00:00 2001 From: Jerome Dockes Date: Thu, 21 Sep 2023 14:23:46 +0200 Subject: [PATCH 4/7] shell --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 4e520a0d4..a448ffeb8 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -70,7 +70,7 @@ jobs: name: 'Install skrub' env: DEPS_VERSION: ${{ matrix.dependencies-version }} - - shell: bash {0} + - shell: bash run: ${{ github.workspace }}/build_tools/github/test.sh working-directory: ${{ runner.temp }} name: 'Run tests' From 059ee3d0b8d1a173a0e501ec10f02f01b4d75982 Mon Sep 17 00:00:00 2001 From: Jerome Dockes Date: Thu, 21 Sep 2023 14:35:41 +0200 Subject: [PATCH 5/7] copy test script to temp dir --- .github/workflows/testing.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index a448ffeb8..b6d41f65d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -70,8 +70,10 @@ jobs: name: 'Install skrub' env: DEPS_VERSION: ${{ matrix.dependencies-version }} - - shell: bash - run: ${{ github.workspace }}/build_tools/github/test.sh + - run: | + cp ./build_tools/github/test.sh ${{ runner.temp }} + - shell: bash {0} + run: ./test.sh working-directory: ${{ runner.temp }} name: 'Run tests' - uses: codecov/codecov-action@v3 From 547fe5272789421583010453d0d4c4c31b6a7ca8 Mon Sep 17 00:00:00 2001 From: Jerome Dockes Date: Thu, 21 Sep 2023 14:47:31 +0200 Subject: [PATCH 6/7] iter --- .github/workflows/testing.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index b6d41f65d..5705d9619 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -72,8 +72,11 @@ jobs: DEPS_VERSION: ${{ matrix.dependencies-version }} - run: | cp ./build_tools/github/test.sh ${{ runner.temp }} + ls ${{ runner.temp }} - shell: bash {0} - run: ./test.sh + run: | + pwd + ls -a working-directory: ${{ runner.temp }} name: 'Run tests' - uses: codecov/codecov-action@v3 From 7edbd68809dc4fb514e577d38789c4d46f4e10a5 Mon Sep 17 00:00:00 2001 From: Jerome Dockes Date: Thu, 21 Sep 2023 15:01:57 +0200 Subject: [PATCH 7/7] use env rather than context --- .github/workflows/testing.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 5705d9619..6a121418d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -70,13 +70,8 @@ jobs: name: 'Install skrub' env: DEPS_VERSION: ${{ matrix.dependencies-version }} - - run: | - cp ./build_tools/github/test.sh ${{ runner.temp }} - ls ${{ runner.temp }} - shell: bash {0} - run: | - pwd - ls -a + run: $GITHUB_WORKSPACE/build_tools/github/test.sh working-directory: ${{ runner.temp }} name: 'Run tests' - uses: codecov/codecov-action@v3