From d818fb61d06fd69166cb6dadaf839d7c577bff3b Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 10 Oct 2022 17:46:21 +0100 Subject: [PATCH 1/8] Fixup: run unittests GitHub Actions workflow to use OS specified within the job's matrix variables --- .github/workflows/unittests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 26166e84f..0126b983d 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -10,11 +10,11 @@ on: jobs: test: - runs-on: ubuntu-latest strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-rc.1"] + runs-on: {{ matrix.os }} steps: - uses: actions/checkout@v3 - name: Set up Python From 2163c5861fc849b112dbd78a6bee316701e10530 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 10 Oct 2022 17:50:41 +0100 Subject: [PATCH 2/8] Fixup: add missing '$' symbol for variable expansion --- .github/workflows/unittests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 0126b983d..8808d723b 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -14,7 +14,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-rc.1"] - runs-on: {{ matrix.os }} + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - name: Set up Python From a3536126cef418dcd9b91f2fad1f8e78354d61cd Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 10 Oct 2022 18:09:16 +0100 Subject: [PATCH 3/8] GitHub Actions: exclude {os:windows-latest, python:3.11.0-rc.1} combination from unittest matrix --- .github/workflows/unittests.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 8808d723b..12a13af43 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -14,6 +14,9 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-rc.1"] + exclude: + - os: windows-latest + python-version: "3.11.0-rc.1" runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 From 4d839d1bad7aca7539d7950abad3588283e82a39 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 10 Oct 2022 18:15:34 +0100 Subject: [PATCH 4/8] GitHub Actions: remove coveralls.io step from unittests workflow I believe that our coveralls integration no longer uses GitHub Actions, so I think that this should be safe to do --- .github/workflows/unittests.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 12a13af43..fa54a1849 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -31,8 +31,3 @@ jobs: - name: Unittest and Coverage Report run: | python run_tests.py - - name: coveralls.io - uses: AndreMiras/coveralls-python-action@develop - with: - # coveralls repo token - github-token: "SmlfzlVJy4ow55rduU7IU5GmmFCfAdGeq" From 9956ae430cd39ec52c4082ff65161e11621c2fd9 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 10 Oct 2022 18:32:35 +0100 Subject: [PATCH 5/8] GitHub Actions: exclude {os:macos-latest, python:3.11.0-rc.1} combination from unittest matrix --- .github/workflows/unittests.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index fa54a1849..2cf4d1f0b 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -15,6 +15,8 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-rc.1"] exclude: + - os: macos-latest + python-version: "3.11.0-rc.1" - os: windows-latest python-version: "3.11.0-rc.1" runs-on: ${{ matrix.os }} From 93c0c86a4a27697d34efcc1d04d9531af2df6223 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 10 Oct 2022 18:41:10 +0100 Subject: [PATCH 6/8] revertme: one-time commit to try to determine what went wrong for {macos-latest, 3.11.0-rc.1} during GHA build of 9956ae430cd39ec52c4082ff65161e11621c2fd9 --- .github/workflows/unittests.yaml | 9 ++------- tests/test_data/test_settings_module/test_settings.py | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 2cf4d1f0b..3d5e2f231 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -12,13 +12,8 @@ jobs: test: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-rc.1"] - exclude: - - os: macos-latest - python-version: "3.11.0-rc.1" - - os: windows-latest - python-version: "3.11.0-rc.1" + os: [macos-latest] + python-version: ["3.11.0-rc.1"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/tests/test_data/test_settings_module/test_settings.py b/tests/test_data/test_settings_module/test_settings.py index 53d6ea671..46c5d5b8b 100644 --- a/tests/test_data/test_settings_module/test_settings.py +++ b/tests/test_data/test_settings_module/test_settings.py @@ -1,4 +1,4 @@ SUPPRESS_EXCEPTIONS = True TEST_MODE = True META_HTTP_EQUIV = True -# LOG_LEVEL = 20 +LOG_LEVEL = 10 From 401a0ca03d120b31d3be076cf7546914caba2a4b Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 10 Oct 2022 18:49:34 +0100 Subject: [PATCH 7/8] Revert "revertme: one-time commit to try to determine what went wrong for {macos-latest, 3.11.0-rc.1} during GHA build of 9956ae430cd39ec52c4082ff65161e11621c2fd9" This reverts commit 93c0c86a4a27697d34efcc1d04d9531af2df6223. --- .github/workflows/unittests.yaml | 9 +++++++-- tests/test_data/test_settings_module/test_settings.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 3d5e2f231..2cf4d1f0b 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -12,8 +12,13 @@ jobs: test: strategy: matrix: - os: [macos-latest] - python-version: ["3.11.0-rc.1"] + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-rc.1"] + exclude: + - os: macos-latest + python-version: "3.11.0-rc.1" + - os: windows-latest + python-version: "3.11.0-rc.1" runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/tests/test_data/test_settings_module/test_settings.py b/tests/test_data/test_settings_module/test_settings.py index 46c5d5b8b..53d6ea671 100644 --- a/tests/test_data/test_settings_module/test_settings.py +++ b/tests/test_data/test_settings_module/test_settings.py @@ -1,4 +1,4 @@ SUPPRESS_EXCEPTIONS = True TEST_MODE = True META_HTTP_EQUIV = True -LOG_LEVEL = 10 +# LOG_LEVEL = 20 From bdf58c54158173703494f0261a4398d1a65ca981 Mon Sep 17 00:00:00 2001 From: James Addison Date: Mon, 10 Oct 2022 20:18:33 +0100 Subject: [PATCH 8/8] GitHub Actions: exclude {os:macos-latest, python:3.10} combination from unittest matrix --- .github/workflows/unittests.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 2cf4d1f0b..2bcbc13ae 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -15,6 +15,8 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-rc.1"] exclude: + - os: macos-latest + python-version: "3.10" - os: macos-latest python-version: "3.11.0-rc.1" - os: windows-latest