From edb03981c3bf0168e983afcd4dced07d1878eabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?= Date: Fri, 23 Oct 2026 11:45:41 -0600 Subject: [PATCH] chore: Use Tox 4.61+ labeled ranges to generate environment matrix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Edgar Ramírez Mondragón --- .github/workflows/test.yml | 6 +++--- tox.toml | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e3e0207..bbe4a4e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,20 +52,20 @@ jobs: - name: Run tests with PyTest 9 run: tox env: - TOXENV: ${{ matrix.python-version }}-pytest-9 + TOXENV: ${{ matrix.python-version }}-pytest9 PYTEST_PLUGINS: pytest_github_actions_annotate_failures,rerunfailures,xdist - name: Run tests with PyTest 8 run: tox env: - TOXENV: ${{ matrix.python-version }}-pytest-8 + TOXENV: ${{ matrix.python-version }}-pytest8 PYTEST_PLUGINS: pytest_github_actions_annotate_failures,rerunfailures,xdist - name: Run tests with PyTest 7 run: tox if: runner.os != 'Windows' env: - TOXENV: ${{ matrix.python-version }}-pytest-7 + TOXENV: ${{ matrix.python-version }}-pytest7 PYTEST_PLUGINS: pytest_github_actions_annotate_failures,rerunfailures,xdist post-test: diff --git a/tox.toml b/tox.toml index 8558c3d..9efc703 100644 --- a/tox.toml +++ b/tox.toml @@ -1,25 +1,24 @@ requires = [ - "tox>=4.49", + "tox>=4.61", "tox-uv", ] env_list = [ { product = [ { prefix = "py3", start = 10 }, - ["pytest"], - { pytestver = ["7", "8", "9"] }, + { pytestver = { prefix = "pytest", start = 7, stop = 9 } }, ] }, ] [env_run_base] -description = "run tests with Python {py_dot_ver} and pytest {factor:pytestver}" +description = "run tests with Python {py_dot_ver} and {factor:pytestver}" deps = [ - { replace = "if", condition = "factor['9']", then = [ + { replace = "if", condition = "factor['pytest9']", then = [ "pytest>=9.0.0,<10.0.0", ], extend = true }, - { replace = "if", condition = "factor['8']", then = [ + { replace = "if", condition = "factor['pytest8']", then = [ "pytest>=8.0.0,<9.0.0", ], extend = true }, - { replace = "if", condition = "factor['7']", then = [ + { replace = "if", condition = "factor['pytest7']", then = [ "pytest>=7.0.0,<8.0.0", "pytest-rerunfailures<16.2", ], extend = true },