From 63285b933fdb7878e39504f356479260448ca66d Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Sun, 15 Jan 2023 10:37:17 -0500 Subject: [PATCH 1/5] fix linter action config --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ce8761c..05a1838 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -98,10 +98,10 @@ jobs: strategy: fail-fast: false - tox-environment: + matrix: + tox-environment: - docs - style - - pkglint steps: - uses: actions/checkout@v3 From 8b4885f26c618056a0e905349f0cf7c95ed98d4a Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Sun, 15 Jan 2023 10:39:25 -0500 Subject: [PATCH 2/5] set the version of python to use for linter jobs --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 05a1838..ead0771 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -110,6 +110,8 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 + with: + python-version: "3.11" - name: Install dependencies run: python -m pip install tox From f5b8523040f537545287fdb3eba3c5ae4298b6da Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Sun, 15 Jan 2023 10:40:07 -0500 Subject: [PATCH 3/5] do not specify python version for docs env in tox settings --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index ba242cc..b20ddae 100644 --- a/tox.ini +++ b/tox.ini @@ -31,7 +31,6 @@ setenv = commands = ksh ./tests/run_tests {envdir} [] [testenv:docs] -basepython=python2.7 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/docs/requirements.txt From ef3d2d12b16409202c9077077228fa2065eefcf8 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Sun, 15 Jan 2023 10:41:36 -0500 Subject: [PATCH 4/5] update tox config for tox 4 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b20ddae..e375374 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ deps = -rrequirements.txt setenv = TOXIC = true SHELL = /bin/bash -whitelist_externals = +allowlist_externals = bash zsh ksh From 5c78c0d5f8ac4de3198e70b4480c5aeb6d070165 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Sun, 15 Jan 2023 10:43:46 -0500 Subject: [PATCH 5/5] set python version for zsh job in ci --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ead0771..4ae527f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,6 +53,8 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 + with: + python-version: "3.11" - name: Install dependencies run: python -m pip install tox