Fail lint CI if the PR doesn't target main (#3477)

[etc/vim.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 7af9e48d6f06079d9c610515e8db11c37b9f2a80..4934514264bb51f7d41224eeb6feb66958a9a4fe 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
 [tox]

-envlist = {,ci-}py{36,37,38,39,310,py3},fuzz,run_self
+isolated_build = true
+envlist = {,ci-}py{37,38,39,310,311,py3},fuzz,run_self

 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src


@@ -50,6 +51,35 @@ commands =
         --cov --cov-append {posargs}
     coverage report
 
         --cov --cov-append {posargs}
     coverage report
 

+[testenv:{,ci-}311]
+setenv =
+  PYTHONPATH = {toxinidir}/src
+  AIOHTTP_NO_EXTENSIONS = 1
+skip_install = True
+recreate = True
+deps =
+; We currently need > aiohttp 3.8.1 that is on PyPI for 3.11
+    git+https://github.com/aio-libs/aiohttp
+    -r{toxinidir}/test_requirements.txt
+; a separate worker is required in ci due to https://foss.heptapod.net/pypy/pypy/-/issues/3317
+; this seems to cause tox to wait forever
+; remove this when pypy releases the bugfix
+commands =
+    pip install -e .[d]
+    coverage erase
+    pytest tests \
+        --run-optional no_jupyter \
+        !ci: --numprocesses auto \
+        ci: --numprocesses 1 \
+        --cov {posargs}
+    pip install -e .[jupyter]
+    pytest tests --run-optional jupyter \
+        -m jupyter \
+        !ci: --numprocesses auto \
+        ci: --numprocesses 1 \
+        --cov --cov-append {posargs}
+    coverage report
+

 [testenv:fuzz]
 skip_install = True
 deps =
 [testenv:fuzz]
 skip_install = True
 deps =


@@ -59,7 +89,7 @@ deps =
 commands =
     pip install -e .[d]
     coverage erase
 commands =
     pip install -e .[d]
     coverage erase

-    coverage run fuzz.py
+    coverage run {toxinidir}/scripts/fuzz.py

     coverage report
 
 [testenv:run_self]
     coverage report
 
 [testenv:run_self]


@@ -67,4 +97,4 @@ setenv = PYTHONPATH = {toxinidir}/src
 skip_install = True
 commands =
     pip install -e .[d]
 skip_install = True
 commands =
     pip install -e .[d]

-    black --check {toxinidir}/src {toxinidir}/tests {toxinidir}/setup.py
+    black --check {toxinidir}/src {toxinidir}/tests