Merge branch 'master' into fix/py39

Author: ssbarnea

.github/workflows/tox.yml

@@ -4,9 +4,10 @@ on:
   create:  # is used for publishing to PyPI and TestPyPI
     tags:  # any tag regardless of its name, no branches
   push:  # only publishes pushes to the main branch to TestPyPI
-    branches:  # any branch but not tag
-    - >-
-      **
+    branches:  # any maintenance branch but not tag
+      # avoid generic ** as it duplicates builds from temporary branches
+      - "master"
+      - "stable/**"
     tags-ignore:
     - >-
       **
@@ -29,6 +30,8 @@ jobs:
             python-version: 3.8
           - name: py39
             python-version: 3.9
+          - name: devel
+            python-version: 3.8
           - name: pypy3
             python-version: pypy3
     steps:

tox.ini

@@ -27,7 +27,11 @@ basepython = python3
 pip_pre = True
 deps =
     {[testenv]deps}
-    pytest @ git+https://github.com/pytest-dev/pytest.git
+    ansi2html @ git+https://github.com/pycontribs/ansi2html.git
+    pytest-rerunfailures @ git+https://github.com/pytest-dev/pytest-rerunfailures.git
+    # Temporary disable pytest git install due to
+    # https://github.com/pytest-dev/pytest-rerunfailures/issues/134
+    # pytest @ git+https://github.com/pytest-dev/pytest.git
 
 [flake8]
 max-line-length = 88