From 355cd17726522828dbaf6c59bd49d4b8cfe5dbdd Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Tue, 28 Feb 2023 09:33:08 +0200 Subject: [PATCH 1/2] Tox: also test with pytz installed --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 551d20115..4cb4dcb67 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist = py{37,38,39,310,311} pypy3 + py{37,38}-pytz [testenv] deps = @@ -10,6 +11,7 @@ deps = freezegun==0.3.12 backports.zoneinfo;python_version<"3.9" tzdata;sys_platform == 'win32' + pytz: pytz allowlist_externals = make commands = make clean-cldr test setenv = From 7aeca451b53c1a13180eb2b54911f89386e45cea Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Tue, 28 Feb 2023 09:35:53 +0200 Subject: [PATCH 2/2] Tox: return to tox-gh-actions (which now supports Tox 4) --- .github/workflows/test.yml | 2 +- tox.ini | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e87f23e5f..a35a1b4f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - python -m pip install 'tox~=4.0' 'tox-gh~=1.0' + python -m pip install 'tox~=4.0' 'tox-gh-actions~=3.0' - name: Run test via Tox run: tox --skip-missing-interpreters env: diff --git a/tox.ini b/tox.ini index 4cb4dcb67..1156fecc6 100644 --- a/tox.ini +++ b/tox.ini @@ -21,11 +21,11 @@ passenv = PYTEST_* PYTHON_* -[gh] +[gh-actions] python = - pypy3 = pypy3 - 3.7 = py37 - 3.8 = py38 - 3.9 = py39 - 3.10 = py310 - 3.11 = py311 + pypy3: pypy3 + 3.7: py37 + 3.8: py38 + 3.9: py39 + 3.10: py310 + 3.11: py311