From 22048fa5e50d909d79b3b37d76d9274ac78f0f2e Mon Sep 17 00:00:00 2001 From: fedem-p Date: Fri, 20 May 2022 10:37:38 +0200 Subject: [PATCH 1/7] changed autoactivation conda for tests --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 82dacff8..34e6b910 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,7 +62,7 @@ jobs: activate-environment: stytra_env environment-file: environment.yml python-version: ${{ matrix.python-version }} - auto-activate-base: false + auto-activate-base: true # install linux libraries for display server - name: Install Linux libraries From 9badfe82afa8922e2f1b43ccb0345f2b61d42e10 Mon Sep 17 00:00:00 2001 From: fedem-p Date: Fri, 20 May 2022 10:51:03 +0200 Subject: [PATCH 2/7] testing parallel testing with 2 threads --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 34e6b910..2e981ff7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -112,7 +112,7 @@ jobs: shell: bash -l {0} run: | conda activate stytra_env - pytest -n3 --forked + pytest -n2 --forked From 10df11782b6e0a3e7e0ece1674da3515520ea418 Mon Sep 17 00:00:00 2001 From: fedem-p Date: Fri, 20 May 2022 11:07:31 +0200 Subject: [PATCH 3/7] test previous version of pytests --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index 45f5473a..6abb5518 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -3,7 +3,7 @@ flake8 tox Sphinx -pytest +pytest==7.0.1 pytest-cov black==22.3.0 From 02e05599d8b0dfd426b6da36583a66b04118665e Mon Sep 17 00:00:00 2001 From: fedem-p Date: Fri, 20 May 2022 11:48:28 +0200 Subject: [PATCH 4/7] test non-parallel --- .github/workflows/main.yml | 2 +- requirements_dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e981ff7..e1ad1a4d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -112,7 +112,7 @@ jobs: shell: bash -l {0} run: | conda activate stytra_env - pytest -n2 --forked + pytest --forked diff --git a/requirements_dev.txt b/requirements_dev.txt index 6abb5518..45f5473a 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -3,7 +3,7 @@ flake8 tox Sphinx -pytest==7.0.1 +pytest pytest-cov black==22.3.0 From 59a303437ddd4089f394717129da11c429cf6494 Mon Sep 17 00:00:00 2001 From: fedem-p Date: Fri, 3 Jun 2022 13:10:19 +0200 Subject: [PATCH 5/7] test removing separate processes --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1ad1a4d..e1186b9e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -112,7 +112,7 @@ jobs: shell: bash -l {0} run: | conda activate stytra_env - pytest --forked + pytest From e16b524360a8149c1c16b152511a20d34a08ad3f Mon Sep 17 00:00:00 2001 From: fedem-p Date: Fri, 3 Jun 2022 13:28:26 +0200 Subject: [PATCH 6/7] test exporting display --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1186b9e..792de0b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -112,7 +112,8 @@ jobs: shell: bash -l {0} run: | conda activate stytra_env - pytest + echo "DISPLAY=:1.0" >> $GITHUB_ENV + pytest --forked From 5d580c85e28bbb074cec1332976e1d37b3fc63b3 Mon Sep 17 00:00:00 2001 From: fedem-p Date: Fri, 3 Jun 2022 13:50:25 +0200 Subject: [PATCH 7/7] specifing ubuntu version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 792de0b4..0584c906 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: tests: needs: lint name: 🤖 Tests (${{ matrix.python-version }}) - runs-on: "ubuntu-latest" + runs-on: "ubuntu:20.04" # don't run workflow if pr draft if: github.event.pull_request.draft == false strategy: