Merge branch 'master' into dtls

docs-requirements.in

@@ -1,5 +1,8 @@
 # RTD is currently installing 1.5.3, which has a bug in :lineno-match:
-sphinx >= 1.7.0
+# sphinx-3.4 causes warnings about some trio._abc classes: GH#2338
+sphinx >= 1.7.0, < 3.4
+# jinja2-3.1 causes importerror with sphinx<4.0
+jinja2 < 3.1
 sphinx_rtd_theme
 sphinxcontrib-trio
 towncrier

docs-requirements.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    pip-compile --output-file docs-requirements.txt docs-requirements.in
+#    pip-compile docs-requirements.in
 #
 alabaster==0.7.12
     # via sphinx
@@ -16,7 +16,7 @@ babel==2.10.3
     # via sphinx
 certifi==2022.6.15
     # via requests
-charset-normalizer==2.0.12
+charset-normalizer==2.1.0
     # via requests
 click==8.1.3
     # via
@@ -32,14 +32,15 @@ idna==3.3
     # via
     #   -r docs-requirements.in
     #   requests
-imagesize==1.3.0
+imagesize==1.4.1
     # via sphinx
 immutables==0.18
     # via -r docs-requirements.in
 incremental==21.3.0
     # via towncrier
 jinja2==3.0.3
     # via
+    #   -r docs-requirements.in
     #   sphinx
     #   towncrier
 markupsafe==2.1.1
@@ -48,13 +49,13 @@ outcome==1.2.0
     # via -r docs-requirements.in
 packaging==21.3
     # via sphinx
-pygments==2.10.0
+pygments==2.12.0
     # via sphinx
 pyparsing==3.0.9
     # via packaging
 pytz==2022.1
     # via babel
-requests==2.28.0
+requests==2.28.1
     # via sphinx
 sniffio==1.2.0
     # via -r docs-requirements.in
@@ -87,5 +88,8 @@ tomli==2.0.1
     # via towncrier
 towncrier==21.9.0
     # via -r docs-requirements.in
-urllib3==1.26.9
+urllib3==1.26.11
     # via requests
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

docs/source/code-of-conduct.rst

@@ -78,7 +78,7 @@ Examples of unacceptable behavior by participants include:
    electronic address, without explicit permission. This includes any
    sort of "outing" of any aspect of someone's identity without their
    consent.
--  Publishing private screenshots or quotes of interactions in the
+-  Publishing screenshots or quotes of private interactions in the
    context of this project without all quoted users' *explicit* consent.
 -  Publishing of private communication that doesn't have to do with
    reporting harassment.

test-requirements.in

@@ -2,7 +2,7 @@
 pytest >= 5.0         # for faulthandler in core
 pytest-cov >= 2.6.0
 # ipython 7.x is the last major version supporting Python 3.7
-ipython ~= 7.31       # for the IPython traceback integration tests
+ipython < 7.32        # for the IPython traceback integration tests
 pyOpenSSL >= 22.0.0   # for the ssl + DTLS tests
 trustme               # for the ssl + DTLS tests
 pylint                # for pylint finding all symbols tests

test-requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    pip-compile test-requirements.in
@@ -10,22 +10,32 @@ astroid==2.11.6
     # via pylint
 async-generator==1.10
     # via -r test-requirements.in
+atomicwrites==1.4.0
+    # via pytest
 attrs==21.4.0
     # via
     #   -r test-requirements.in
     #   outcome
     #   pytest
 backcall==0.2.0
     # via ipython
-black==22.3.0 ; implementation_name == "cpython"
+black==22.6.0 ; implementation_name == "cpython"
     # via -r test-requirements.in
-cffi==1.15.0
-    # via cryptography
+cffi==1.15.1 ; os_name == "nt"
+    # via
+    #   -r test-requirements.in
+    #   cryptography
 click==8.1.3
     # via black
-coverage[toml]==6.3.3
+colorama==0.4.5
+    # via
+    #   click
+    #   ipython
+    #   pylint
+    #   pytest
+coverage[toml]==6.4.1
     # via pytest-cov
-cryptography==37.0.2
+cryptography==37.0.4
     # via
     #   -r test-requirements.in
     #   pyopenssl
@@ -73,8 +83,6 @@ parso==0.8.3
     # via jedi
 pathspec==0.9.0
     # via black
-pexpect==4.8.0
-    # via ipython
 pickleshare==0.7.5
     # via ipython
 platformdirs==2.5.2
@@ -83,10 +91,8 @@ platformdirs==2.5.2
     #   pylint
 pluggy==1.0.0
     # via pytest
-prompt-toolkit==3.0.29
+prompt-toolkit==3.0.30
     # via ipython
-ptyprocess==0.7.0
-    # via pexpect
 py==1.11.0
     # via pytest
 pycodestyle==2.8.0
@@ -95,9 +101,9 @@ pycparser==2.21
     # via cffi
 pyflakes==2.4.0
     # via flake8
-pygments==2.10.0
+pygments==2.12.0
     # via ipython
-pylint==2.14.3
+pylint==2.14.4
     # via -r test-requirements.in
 pyopenssl==22.0.0
     # via -r test-requirements.in
@@ -120,7 +126,7 @@ tomli==2.0.1
     #   mypy
     #   pylint
     #   pytest
-tomlkit==0.11.0
+tomlkit==0.11.1
     # via pylint
 traitlets==5.3.0
     # via
@@ -136,7 +142,7 @@ types-ipaddress==1.0.7
     # via types-cryptography
 types-pyopenssl==21.0.3 ; implementation_name == "cpython"
     # via -r test-requirements.in
-typing-extensions==4.2.0 ; implementation_name == "cpython"
+typing-extensions==4.3.0 ; implementation_name == "cpython"
     # via
     #   -r test-requirements.in
     #   astroid

trio/_subprocess.py

@@ -512,7 +512,7 @@ async def run_process(
     the subprocess's output for further processing, then use ``stdout=subprocess.PIPE``
     and then make sure to read the data out of the `Process.stdout` stream. If you want
     to capture stderr separately, use ``stderr=subprocess.PIPE``. If you want to capture
-    both, but mixed together in the correct order, use ``stdout=subproces.PIPE,
+    both, but mixed together in the correct order, use ``stdout=subprocess.PIPE,
     stderr=subprocess.STDOUT``.
 
     **Error checking:** If the subprocess exits with a nonzero status

trio/tests/test_threads.py

@@ -749,5 +749,4 @@ def __bool__(self):
             raise NotImplementedError
 
     with pytest.raises(NotImplementedError):
-        with _core.CancelScope(deadline=_core.current_time() + 0.01):
-            await to_thread_run_sync(time.sleep(1), cancellable=BadBool())
+        await to_thread_run_sync(int, cancellable=BadBool())