Merge remote-tracking branch 'skeleton/main' into main

Author: pombredanne

setup.cfg

@@ -60,8 +60,7 @@ where=src
 
 [options.extras_require]
 testing =
-    # upstream
-    pytest >= 6
+    pytest >= 6, != 7.0.0
     pytest-xdist >= 2
     black
 docs=