From d4a66fcab0decc75391679b45766b64f952752c3 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Wed, 31 Jul 2024 15:31:05 +0200 Subject: [PATCH 1/2] Test: use tox4 to run the tests Define https://tox.wiki/en/4.16.0/config.html#skip_missing_interpreters so when running on CircleCI it only runs the environments for the Python versions we have defined. --- .circleci/config.yml | 29 +++++++---------------------- tox.ini | 3 ++- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74869c4..4904374 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,52 +3,37 @@ version: 2.1 commands: run-tox: description: "Run tox" - parameters: - version: - type: string - sphinx-version: - type: string - default: "5,6,7,8,latest,dev" steps: - checkout - # NOTE: use Tox 3.x until I understand the syntax for generative environments: - # https://tox.wiki/en/stable/user_guide.html#generative-environment-list - - run: pip install --user "tox<4" - - run: tox -e "<>-sphinx{<>}" + - run: pip install --user tox + - run: tox jobs: py38: docker: - image: 'cimg/python:3.8' steps: - - run-tox: - version: py38 - sphinx-version: "5,6" + - run-tox py39: docker: - image: 'cimg/python:3.9' steps: - - run-tox: - version: py39 - sphinx-version: "5,6,7" + - run-tox py310: docker: - image: 'cimg/python:3.10' steps: - - run-tox: - version: py310 + - run-tox py311: docker: - image: 'cimg/python:3.11' steps: - - run-tox: - version: py311 + - run-tox py312: docker: - image: 'cimg/python:3.12' steps: - - run-tox: - version: py312 + - run-tox docs: docker: - image: 'cimg/python:3.12' diff --git a/tox.ini b/tox.ini index a2107a8..62a30c3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,7 @@ [tox] # https://tox.wiki/en/latest/example/package.html#flit -isolated_build = True +isolated_build = true +skip_missing_interpreters = true envlist = docs From 84948d3c721b9c1901962c546e4837c8da8e17bb Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Wed, 31 Jul 2024 15:43:45 +0200 Subject: [PATCH 2/2] Skip running docs env --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4904374..1a38f93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ commands: steps: - checkout - run: pip install --user tox - - run: tox + - run: tox --skip-env docs jobs: py38: