Merge branch 'main' into drop_pypy36

altendky · web-flow · commit fc356b9841c5 · 2022-03-15T09:44:02.000-04:00
diff --git a/testing/conftest.py b/testing/conftest.py
@@ -2,7 +2,7 @@
 import pytest_twisted
 
 
-pytest_plugins = "_pytest.pytester"
+pytest_plugins = "pytester"
 
 
 @pytest.hookimpl(tryfirst=True)
