Merge branch 'master' into ipython_exceptiongroup_support

python-trio · Jul 20, 2023 · 00ba87b · 00ba87b
2 parents 0e692c0 + 11fa77d
commit 00ba87b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/docs/source/reference-core.rst b/docs/source/reference-core.rst
@@ -693,7 +693,7 @@ Errors in multiple child tasks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Normally, in Python, only one thing happens at a time, which means
-that only one thing can wrong at a time. Trio has no such
+that only one thing can go wrong at a time. Trio has no such
 limitation. Consider code like::
 
     async def broken1():

diff --git a/docs/source/releasing.rst b/docs/source/releasing.rst
@@ -29,7 +29,7 @@ Things to do for releasing:
 
       - review history change
 
-      - ``git rm`` changes
+      - ``git rm`` the now outdated newfragments
 
    + commit
 
@@ -53,4 +53,10 @@ Things to do for releasing:
 
 * merge the release pull request
 
+* make a GitHub release (go to the tag and press "Create release from tag")
+
+   + paste in the new content in ``history.rst`` and convert it to markdown: turn the parts under section into ``---``, update links to just be the links, and whatever else is necessary.
+
+   + include anything else that might be pertinent, like a link to the commits between the latest and current release.
+
 * announce on gitter
diff --git a/trio/_core/_tests/test_multierror.py b/trio/_core/_tests/test_multierror.py
@@ -472,10 +472,10 @@ def run_script(name, use_ipython=False):
     return completed
 
 
-def check_simple_excepthook(completed, uses_ipython):
+def check_simple_excepthook(completed):
     assert_match_in_seq(
         [
-            "in <cell line: " if uses_ipython else "in <module>",
+            "in <module>",
             "MultiError",
             "--- 1 ---",
             "in exc1_fn",
@@ -502,14 +502,14 @@ def check_simple_excepthook(completed, uses_ipython):
 @need_ipython
 def test_ipython_exc_handler():
     completed = run_script("simple_excepthook.py", use_ipython=True)
-    check_simple_excepthook(completed, True)
+    check_simple_excepthook(completed)
 
 
 @slow
 @need_ipython
 def test_ipython_imported_but_unused():
     completed = run_script("simple_excepthook_IPython.py")
-    check_simple_excepthook(completed, False)
+    check_simple_excepthook(completed)
 
 
 @slow