summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini12
1 files changed, 9 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index 37cfdbb31c..d11a1d69e0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,8 +51,6 @@ commands =
description =
Run style checks.
envdir = {toxworkdir}/shared
-passenv =
- DISABLE_CHERRY_PICK_CHECK
commands =
{[testenv:mypy]commands}
bash tools/flake8wrap.sh {posargs}
@@ -60,7 +58,6 @@ commands =
bash -c "! find doc/ -type f -name *.json | xargs grep -U -n $'\r'"
# Check that all included JSON files are valid JSON
bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'
- bash tools/check-cherry-picks.sh
[testenv:fast8]
description =
@@ -69,6 +66,15 @@ envdir = {toxworkdir}/shared
commands =
bash tools/flake8wrap.sh -HEAD
+[testenv:validate-backport]
+description =
+ Determine whether a backport is ready to be merged by checking whether it has
+ already been merged to master or more recent stable branches.
+deps =
+skipsdist = true
+commands =
+ bash tools/check-cherry-picks.sh
+
[testenv:functional]
description =
Run functional tests using python3.