Skip to content

Commit

Permalink
Merge branch 'main' into work/CRAFT-3739-add-prompting
Browse files Browse the repository at this point in the history
  • Loading branch information
tigarmo authored Dec 20, 2024
2 parents 716a7b5 + c663d58 commit af42b4b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ jobs:
with:
python-version: |
3.8
3.9
3.10
3.11
3.12-dev
3.12
- name: Configure environment
run: |
echo "::group::pip install"
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
env_list = # Environments to run when called with no parameters.
lint-{ruff,pyright,shellcheck,codespell,docs}
test-{py38,py310,py311}
test-{py38,py310,py312}
minversion = 4.5
# Tox will use these requirements to bootstrap a venv if necessary.
# tox-igore-env-name-mismatch allows us to have one virtualenv for all linting.
Expand Down Expand Up @@ -36,7 +36,7 @@ commands_pre = mkdir -p results
base = testenv, test
description = Run unit tests with pytest
labels =
py38, py310, py311: tests, unit-tests
py38, py310, py312: tests, unit-tests
commands =
# NOTE: we use `coverage` directly here instead of pytest-cov because the loading of the
# pytest plugin provided by craft-cli means that some code gets imported *before*
Expand All @@ -48,7 +48,7 @@ commands =
base = testenv, test
description = Run integration tests with pytest
labels =
py38, py310, py311: tests, integration-tests
py38, py310, py312: tests, integration-tests
commands =
# NOTE: we use `coverage` directly here instead of pytest-cov because the loading of the
# pytest plugin provided by craft-cli means that some code gets imported *before*
Expand Down

0 comments on commit af42b4b

Please sign in to comment.