Skip to content

Commit 0f1b5cc

Browse files
committed
Improvements to tox.ini setup
- Correctly call the new Cy2026 impl, caveats, and examples tests - Ensure running tox locally will be able to find python 3.7. This will also get applied to the github actions.
1 parent 8545b5e commit 0f1b5cc

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/actions/setup-tox/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ runs:
6363

6464
- name: Install dependencies
6565
shell: bash
66-
# NOTE: The virtualenv and tox requirements support finding python 3.7,
67-
# if we drop support for python 3.7 the reqs can be simplified and updated
6866
run: |
6967
python --version
7068
python -m pip install --upgrade pip
71-
python -m pip install "tox<=4.23.2" "virtualenv<=20.26.6"
69+
python -m pip install tox

tox.ini

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ envlist =
4444
# Cy2024, Cy2025
4545
test-py311-{PySide,PyQt}6.5-{impl,caveats,examples}
4646
# Cy2026
47-
test-py313-{PySide,PyQt}6.8
47+
test-py313-{PySide,PyQt}6.8-{impl,caveats,examples}
4848
# Test newer versions of python/Qt than VFX Reference Platform has chosen
4949
test-py{312}-{PySide,PyQt}{6.8}-{impl,caveats,examples}
5050
test-py{314}-{PySide,PyQt}{6.9}-{impl,caveats,examples}
@@ -55,6 +55,11 @@ envlist =
5555
mypy
5656

5757
skip_missing_interpreters = True
58+
requires =
59+
# NOTE: The virtualenv and tox requirements support finding python 3.7,
60+
# if we drop support for python 3.7 the reqs can be simplified and updated.
61+
tox<=4.23.2
62+
virtualenv<=20.26.6
5863

5964
[testenv]
6065
# These are used by all other testenv definitions unless overridden

0 commit comments

Comments
 (0)