Merge branch 'master' into spdx-compliant-license

Author: pquentin

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.6', '3.7', '3.8', '3.9']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.6', '3.6', '3.7', '3.8', '3.9', '3.8-dev', '3.9-dev']
+        python: ['pypy-3.7', '3.7', 'pypy-3.8', '3.8', 'pypy-3.9', '3.9', '3.10', '3.11']
         check_formatting: ['0']
         check_docs: ['0']
         extra_name: ['']
@@ -74,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.6', '3.7', '3.8', '3.9']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.style.yapf

@@ -9,15 +9,7 @@ To run tests
 
 * Actually run the tests: ``pytest pytest_trio``
 
-
-To run yapf
------------
-
-* Show what changes yapf wants to make: ``yapf -rpd setup.py
-  pytest_trio``
-
-* Apply all changes directly to the source tree: ``yapf -rpi setup.py
-  pytest_trio``
+* Format the code with ``black .``
 
 
 To make a release

CHEATSHEET.rst

@@ -1,5 +1,5 @@
 include README.rst CHEATSHEET.rst LICENSE* CODE_OF_CONDUCT* CONTRIBUTING*
-include .coveragerc .style.yapf
+include .coveragerc
 include test-requirements.txt
 recursive-include docs *
 prune docs/build

MANIFEST.in

@@ -6,9 +6,6 @@ set -ex -o pipefail
 uname -a
 env | sort
 
-# See https://github.com/python-trio/trio/issues/334
-YAPF_VERSION=0.22.0
-
 # Curl's built-in retry system is not very robust; it gives up on lots of
 # network errors that we want to retry on. Wget might work better, but it's
 # not installed on azure pipelines's windows boxes. So... let's try some good
@@ -33,16 +30,16 @@ python setup.py sdist --formats=zip
 python -m pip install dist/*.zip
 
 if [ "$CHECK_FORMATTING" = "1" ]; then
-    pip install yapf==${YAPF_VERSION}
-    if ! yapf -rpd setup.py pytest_trio; then
+    pip install black
+    if ! black --check . ; then
         cat <<EOF
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 Formatting problems were found (listed above). To fix them, run
 
-   pip install yapf==${YAPF_VERSION}
-   yapf -rpi setup.py pytest_trio
+   pip install black
+   black .
 
 in your local checkout.
 

ci.sh

@@ -1,4 +1,3 @@
-# RTD is currently installing 1.5.3, which has a bug in :lineno-match:
 sphinx >= 1.6.1
 sphinx_rtd_theme
 sphinxcontrib-trio
@@ -10,8 +9,6 @@ attrs >= 17.4.0
 towncrier != 19.9.0,!= 21.3.0
 
 # pytest-trio's own dependencies
-trio >= 0.15.0
-async_generator >= 1.9
-outcome
-# For node.get_closest_marker
-pytest >= 3.6
+trio >= 0.22.0
+outcome >= 1.1.0
+pytest >= 7.2.0